From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Sat, 22 Oct 2011 23:52:07 +0000 (-0700)
Subject: tests: fix spurious scons "Error 1" messages
X-Git-Tag: stable_2012_02_02~38^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6dd122feef8cfb4785b8d45f40907bd6c73e04a;p=gem5.git

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.
---

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 ====="