diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2019-10-13 17:19:01 +0200 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2019-10-13 17:19:01 +0200 |
| commit | 1d50a146ea0c7a517564bf3ec2a79cd2bb3c8c79 (patch) | |
| tree | 6be533ee2c82eba3de7619278e1e981473848e46 /src/benchmark.py | |
| parent | 19e1ff660db8a6653d67884d10bc830babc1560d (diff) | |
| parent | cc7edda1871c89c7476c67eacf3e6aee56262e2d (diff) | |
| download | allocbench-1d50a146ea0c7a517564bf3ec2a79cd2bb3c8c79.tar.gz allocbench-1d50a146ea0c7a517564bf3ec2a79cd2bb3c8c79.zip | |
Merge branch 'catch_abort'
Diffstat (limited to 'src/benchmark.py')
| -rw-r--r-- | src/benchmark.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/benchmark.py b/src/benchmark.py index 798cbd6..4dfaa78 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -345,6 +345,7 @@ class Benchmark: 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"] if "LD_LIBRARY_PATH" in alloc: @@ -406,7 +407,7 @@ class Benchmark: result = {} - if res.returncode != 0 or "ERROR: ld.so" in res.stderr or "Segmentation fault" in res.stderr: + if res.returncode != 0 or "ERROR: ld.so" in res.stderr: print() print_debug("Stdout:\n" + res.stdout) print_debug("Stderr:\n" + res.stderr) |