From fb177140043d523545a141bc0902578f46f64031 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Tue, 20 Aug 2019 23:02:08 +0200 Subject: fix benchmarks without measure command --- src/benchmark.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/benchmark.py') 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"]]) -- cgit v1.2.3