aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2018-07-20 16:29:08 +0200
committerFlorian Fischer <florian.fl.fischer@fau.de>2018-07-20 16:29:08 +0200
commit5fe4d2b94edf526ed9b53d764f2962d895f9509e (patch)
tree23c10ceccb7bd605319ef978758ed8d6f88c6dd4
parentf09137d002759913660f812296d2085116917870 (diff)
downloadallocbench-5fe4d2b94edf526ed9b53d764f2962d895f9509e.tar.gz
allocbench-5fe4d2b94edf526ed9b53d764f2962d895f9509e.zip
add LD_LIBRARY_PATH to env if in environment
-rw-r--r--bench_conprod.py2
-rw-r--r--bench_loop.py2
-rw-r--r--bench_mysql.py2
3 files changed, 6 insertions, 0 deletions
diff --git a/bench_conprod.py b/bench_conprod.py
index e444bfb..ef7676f 100644
--- a/bench_conprod.py
+++ b/bench_conprod.py
@@ -54,6 +54,8 @@ class Benchmark_ConProd( Benchmark ):
result = {"VSZ" : [] , "RSS" : []}
env = {"LD_PRELOAD" : t[1]} if t[1] != "" else None
+ if env and "LD_LIBRARY_PATH" in os.environ:
+ env["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
target_cmd = cmd.format(t[0], *args).split(" ")
if verbose:
diff --git a/bench_loop.py b/bench_loop.py
index ab7eec3..6724890 100644
--- a/bench_loop.py
+++ b/bench_loop.py
@@ -55,6 +55,8 @@ class Benchmark_Loop( Benchmark ):
result = {"VSZ": [], "RSS" : []}
env = {"LD_PRELOAD" : t[1]} if t[1] != "" else None
+ if env and "LD_LIBRARY_PATH" in os.environ:
+ env["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
target_cmd = cmd.format(t[0], *args).split(" ")
if verbose:
diff --git a/bench_mysql.py b/bench_mysql.py
index fc0074a..7127317 100644
--- a/bench_mysql.py
+++ b/bench_mysql.py
@@ -96,6 +96,8 @@ class Benchmark_MYSQL( Benchmark ):
for tname, t in self.targets.items():
# No custom build mysqld server supported yet.
env = {"LD_PRELOAD" : t[1]} if t[1] != "" else None
+ if env and "LD_LIBRARY_PATH" in os.environ:
+ env["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
if not self.start_and_wait_for_server(env, verbose, "mysqld.log"):
print("Can't start server for", tname + ".")