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.
This commit is contained in:
parent
38aef4c4c7
commit
c6dd122fee
1 changed files with 3 additions and 1 deletions
|
@ -123,7 +123,9 @@ def run_test(target, source, env):
|
||||||
nap += 1
|
nap += 1
|
||||||
|
|
||||||
outdiff = os.path.join(tgt_dir, 'outdiff')
|
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)
|
% (output_ignore_args, tgt_dir, outdiff)
|
||||||
env.Execute(env.subst(diffcmd, target=target, source=source))
|
env.Execute(env.subst(diffcmd, target=target, source=source))
|
||||||
print "===== Output differences ====="
|
print "===== Output differences ====="
|
||||||
|
|
Loading…
Reference in a new issue