From 241cec136189fbb22cdfa79e99e0001120a699c4 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sun, 9 Feb 2020 13:05:46 +0100 Subject: fix order of LD_PRELOAD We prepend the currently set LD_PRELOAD. LD_PRELOAD=print_status_on_exit sig_handlers allocater.so LD_PRELOAD --- src/benchmark.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/benchmark.py b/src/benchmark.py index 0ec388f..68e83ea 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -372,14 +372,15 @@ class Benchmark: skip = False env = dict(os.environ) - env["LD_PRELOAD"] = env.get("LD_PRELOAD", "") - env["LD_PRELOAD"] += " " + f"{src.globalvars.builddir}/print_status_on_exit.so" - env["LD_PRELOAD"] += " " + f"{src.globalvars.builddir}/sig_handlers.so" - env["LD_PRELOAD"] += " " + alloc["LD_PRELOAD"] + old_ld_preload = env.get('LD_PRELOAD', '') + env["LD_PRELOAD"] = f"{src.globalvars.builddir}/print_status_on_exit.so" + env["LD_PRELOAD"] += f" {src.globalvars.builddir}/sig_handlers.so" + env["LD_PRELOAD"] += f" {alloc['LD_PRELOAD']}" + env["LD_PRELOAD"] += f" {old_ld_preload}" if "LD_LIBRARY_PATH" in alloc: env["LD_LIBRARY_PATH"] = env.get("LD_LIBRARY_PATH", "") - env["LD_LIBRARY_PATH"] += ":" + alloc["LD_LIBRARY_PATH"] + env["LD_LIBRARY_PATH"] += f'{os.pathsep}{alloc["LD_LIBRARY_PATH"]}' try: self.start_servers(alloc_name=alloc_name, alloc=alloc, env=env) -- cgit v1.2.3