summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2011-10-22 16:52:07 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2011-10-22 16:52:07 -0700
commitc6dd122feef8cfb4785b8d45f40907bd6c73e04a (patch)
treeaa97d7e02fc3e7fb10f1d4e408c5bc9d324d2ec8 /tests
parent38aef4c4c7e58e9166616554465bea70afab824f (diff)
downloadgem5-c6dd122feef8cfb4785b8d45f40907bd6c73e04a.tar.xz
tests: fix spurious scons "Error 1" messages
Turns out these are due to diff reporting that files acutally differed via a non-zero exit code.
Diffstat (limited to 'tests')
-rw-r--r--tests/SConscript4
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 ====="