diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
| commit | 706323fa21de674d8064c95a3c0036f0342430ee (patch) | |
| tree | 40bcf3249c0d9d9b21a70f65f0e56ca9020017f7 /tests/SConscript | |
| parent | cbaebb3b5ebe709689f481ad395034335bea2152 (diff) | |
| parent | 6f9d294e8685f49d91af48065736ac1d67e53718 (diff) | |
| download | gem5-706323fa21de674d8064c95a3c0036f0342430ee.tar.xz | |
Merged with recent changes.
Diffstat (limited to 'tests/SConscript')
| -rw-r--r-- | tests/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/SConscript b/tests/SConscript index 0ded4b9ec..12328c0c1 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -123,7 +123,9 @@ def run_test(target, source, env): nap += 1 outdiff = os.path.join(tgt_dir, 'outdiff') - diffcmd = 'diff -ubrs %s ${SOURCES[2].dir} %s > %s' \ + # tack 'true' on the end so scons doesn't report diff's + # non-zero exit code as a build error + diffcmd = 'diff -ubrs %s ${SOURCES[2].dir} %s > %s; true' \ % (output_ignore_args, tgt_dir, outdiff) env.Execute(env.subst(diffcmd, target=target, source=source)) print "===== Output differences =====" |