Skip to content
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.

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

Set-up the environment outside of rr_jll's influence. #67

Merged
merged 1 commit into from
Jul 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BugReporting"
uuid = "bcf9a6e7-4020-453c-b88e-690564246bb8"
authors = ["Keno Fischer <[email protected]>"]
version = "0.2.1"
version = "0.2.2"

[deps]
AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
Expand Down
17 changes: 8 additions & 9 deletions src/BugReporting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,16 @@ function rr_record(args...; trace_dir=nothing)
check_rr_available()
check_perf_event_paranoid()

rr() do rr_path
new_env = copy(ENV)
if trace_dir !== nothing
new_env["_RR_TRACE_DIR"] = trace_dir
end
new_env = copy(ENV)
if trace_dir !== nothing
new_env["_RR_TRACE_DIR"] = trace_dir
end

# loading GDB_jll sets PYTHONHOME via Python_jll. this only matters for replay,
# and shouldn't leak into the Julia environment (which may load its own Python)
delete!(new_env, "PYTHONHOME")
# loading GDB_jll sets PYTHONHOME via Python_jll. this only matters for replay,
# and shouldn't leak into the Julia environment (which may load its own Python)
delete!(new_env, "PYTHONHOME")

# Intersperse all given arguments with spaces, then splat:
rr() do rr_path
rr_cmd = `$(rr_path) record $(global_record_flags)`
for arg in args
rr_cmd = `$(rr_cmd) $(arg)`
Expand Down