changeset 30d0e4c249b5 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=30d0e4c249b5
description:
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:
tests/SConscript | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r c7fec2cb91cb -r 30d0e4c249b5 tests/SConscript
--- a/tests/SConscript Thu Oct 20 13:11:56 2011 -0700
+++ b/tests/SConscript Sat Oct 22 16:52:07 2011 -0700
@@ -123,7 +123,9 @@
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 ====="
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
