From f3a2f62edd79deedff5e6ffaa1d2d7a9f3ac5d11 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Mon, 12 Aug 2019 18:21:44 +0200 Subject: fix benchmarks for any glibc version use the included loader of the build glibc instead of LD_LIBRARY_PATH. Using LD_LIBRARY_PATH probably fails because of incompatible system loaders and newer glibc versions. Then we have to reverse the positions of {measure cmd} and {cmd prefix} in the exec chain because ld loads only ELF binaries and {measure cmd} could be a script. --- src/benchmark.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/benchmark.py') diff --git a/src/benchmark.py b/src/benchmark.py index 49af089..d8e7e81 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -325,8 +325,8 @@ class Benchmark (object): measure_argv = self.measure_cmd.format(**substitutions) measure_argv = src.util.prefix_cmd_with_abspath(measure_argv).split() - argv.extend(prefix_argv) argv.extend(measure_argv) + argv.extend(prefix_argv) argv.extend(["build/exec", "-p", env["LD_PRELOAD"]]) if alloc["LD_LIBRARY_PATH"] != "": argv.extend(["-l", env["LD_LIBRARY_PATH"]]) -- cgit v1.2.3