Skip to content

[lit] Export env vars in script to avoid pruning #105759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 24, 2024
Merged

[lit] Export env vars in script to avoid pruning #105759

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
579bfe7
[lit] Export env vars in script to avoid pruning
keith Aug 23, 2024
50d6de5
Move set -x later
keith Aug 23, 2024
975b067
fix python format
keith Aug 23, 2024
b172924
scope to only DYLD env vars
keith Aug 23, 2024
0262886
remove extra whitespace
keith Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions llvm/utils/lit/lit/TestRunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,16 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):
commands[i] += f" && {{ {command}; }}"
if test.config.pipefail:
f.write(b"set -o pipefail;" if mode == "wb" else "set -o pipefail;")

# Manually export any DYLD_* variables used by dyld on macOS because
# otherwise they are lost when the shell executable is run, before the
# lit test is executed.
env_str = "\n".join(
"export {}={};".format(k, shlex.quote(v))
for k, v in test.config.environment.items()
if k.startswith("DYLD_")
)
f.write(bytes(env_str, "utf-8") if mode == "wb" else env_str)
f.write(b"set -x;" if mode == "wb" else "set -x;")
if sys.version_info > (3, 0) and mode == "wb":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this change but the version check can be dropped.
Nit: the newline before is unrelated to this patch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed whitespace, submitted the version check removal here #105948

f.write(bytes("{ " + "; } &&\n{ ".join(commands) + "; }", "utf-8"))
Expand Down
Loading