sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests: use env.Execute instead of Execute to pick up env vars.

Browse source
This commit is contained in:
Steve Reinhardt 2009-03-11 10:54:42 -07:00
parent a94c68228a
commit 17cb191c98
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/SConscript
View file

@ -87,7 +87,7 @@ def run_test(target, source, env):
# make sure target files are all gone # make sure target files are all gone
for t in target: for t in target:
if os.path.exists(t.abspath): if os.path.exists(t.abspath):
Execute(Delete(t.abspath)) env.Execute(Delete(t.abspath))
tgt_dir = os.path.dirname(str(target[0])) tgt_dir = os.path.dirname(str(target[0]))
@ -102,7 +102,7 @@ def run_test(target, source, env):
if env['BATCH']: if env['BATCH']:
cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd) cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd)
status = Execute(env.subst(cmd, target=target, source=source)) status = env.Execute(env.subst(cmd, target=target, source=source))
if status == 0: if status == 0:
# M5 terminated normally. # M5 terminated normally.
# Run diff on output & ref directories to find differences. # Run diff on output & ref directories to find differences.
@ -110,7 +110,7 @@ def run_test(target, source, env):
outdiff = os.path.join(tgt_dir, 'outdiff') outdiff = os.path.join(tgt_dir, 'outdiff')
diffcmd = 'diff -ubr %s ${SOURCES[2].dir} %s > %s' \ diffcmd = 'diff -ubr %s ${SOURCES[2].dir} %s > %s' \
% (output_ignore_args, tgt_dir, outdiff) % (output_ignore_args, tgt_dir, outdiff)
Execute(env.subst(diffcmd, target=target, source=source)) env.Execute(env.subst(diffcmd, target=target, source=source))
print "===== Output differences =====" print "===== Output differences ====="
print contents(outdiff) print contents(outdiff)
# Run diff-out on stats.txt file # Run diff-out on stats.txt file
@ -118,7 +118,7 @@ def run_test(target, source, env):
diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \ diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \
% (os.path.join(tgt_dir, 'stats.txt'), statsdiff) % (os.path.join(tgt_dir, 'stats.txt'), statsdiff)
diffcmd = env.subst(diffcmd, target=target, source=source) diffcmd = env.subst(diffcmd, target=target, source=source)
status = Execute(diffcmd, strfunction=None) status = env.Execute(diffcmd, strfunction=None)
print "===== Statistics differences =====" print "===== Statistics differences ====="
print contents(statsdiff) print contents(statsdiff)
@ -205,7 +205,7 @@ def update_test(target, source, env):
print " Creating new file", f print " Creating new file", f
copyAction = Copy(os.path.join(dest_dir, f), os.path.join(src_dir, f)) copyAction = Copy(os.path.join(dest_dir, f), os.path.join(src_dir, f))
copyAction.strfunction = None copyAction.strfunction = None
Execute(copyAction) env.Execute(copyAction)
return 0 return 0
def update_test_string(target, source, env): def update_test_string(target, source, env):