SConscript (8528:1f95c9a0bb2f) SConscript (8599:30d0e4c249b5)
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 109 unchanged lines hidden (view full) ---

118 try:
119 m_time = os.stat(statsdiff).st_mtime
120 except OSError:
121 pass
122 time.sleep(1)
123 nap += 1
124
125 outdiff = os.path.join(tgt_dir, 'outdiff')
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2006 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 109 unchanged lines hidden (view full) ---

118 try:
119 m_time = os.stat(statsdiff).st_mtime
120 except OSError:
121 pass
122 time.sleep(1)
123 nap += 1
124
125 outdiff = os.path.join(tgt_dir, 'outdiff')
126 diffcmd = 'diff -ubrs %s ${SOURCES[2].dir} %s > %s' \
126 # tack 'true' on the end so scons doesn't report diff's
127 # non-zero exit code as a build error
128 diffcmd = 'diff -ubrs %s ${SOURCES[2].dir} %s > %s; true' \
127 % (output_ignore_args, tgt_dir, outdiff)
128 env.Execute(env.subst(diffcmd, target=target, source=source))
129 print "===== Output differences ====="
130 print contents(outdiff)
131 # Run diff-out on stats.txt file
132 diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \
133 % (os.path.join(tgt_dir, 'stats.txt'), statsdiff)
134 diffcmd = env.subst(diffcmd, target=target, source=source)

--- 174 unchanged lines hidden --- 		129 % (output_ignore_args, tgt_dir, outdiff)
130 env.Execute(env.subst(diffcmd, target=target, source=source))
131 print "===== Output differences ====="
132 print contents(outdiff)
133 # Run diff-out on stats.txt file
134 diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \
135 % (os.path.join(tgt_dir, 'stats.txt'), statsdiff)
136 diffcmd = env.subst(diffcmd, target=target, source=source)

--- 174 unchanged lines hidden ---