diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2019-08-20 23:02:08 +0200 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2019-08-20 23:02:08 +0200 |
| commit | fb177140043d523545a141bc0902578f46f64031 (patch) | |
| tree | 63b297e364698ef9e209fa19f5a77aeaa7e1bb28 | |
| parent | 29a4dad6dae841b9bc8899990af1fe50ae193050 (diff) | |
| download | allocbench-fb177140043d523545a141bc0902578f46f64031.tar.gz allocbench-fb177140043d523545a141bc0902578f46f64031.zip | |
fix benchmarks without measure command
| -rw-r--r-- | src/benchmark.py | 10 | ||||
| -rw-r--r-- | src/util.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/benchmark.py b/src/benchmark.py index 25a2fa8..c2c0920 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -322,11 +322,13 @@ class Benchmark (object): # Prepend cmd if we are not measuring servers if self.server_cmds == []: prefix_argv = alloc["cmd_prefix"].format(**substitutions).split() - measure_argv = self.measure_cmd.format(**substitutions) - measure_argv = src.util.prefix_cmd_with_abspath(measure_argv).split() + if self.measure_cmd != "": + measure_argv = self.measure_cmd.format(**substitutions) + measure_argv = src.util.prefix_cmd_with_abspath(measure_argv).split() - argv.extend(measure_argv) - argv.extend(["build/exec", "-p", env["LD_PRELOAD"]]) + argv.extend(measure_argv) + + argv.extend([f"{src.globalvars.builddir}/exec", "-p", env["LD_PRELOAD"]]) if alloc["LD_LIBRARY_PATH"] != "": argv.extend(["-l", env["LD_LIBRARY_PATH"]]) diff --git a/src/util.py b/src/util.py index 8549205..3a9367f 100644 --- a/src/util.py +++ b/src/util.py @@ -31,7 +31,7 @@ def prefix_cmd_with_abspath(cmd): Usefull if cmd should be executed by the loader of a custom glibc.""" - if os.path.isabs(cmd): + if os.path.isabs(cmd) or cmd == "": return cmd binary_end = cmd.find(" ") |