summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2009-03-11 10:54:42 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2009-03-11 10:54:42 -0700
commit17cb191c981ddb5a40f40a14a44e7b7ee7576c0d (patch)
tree80ad8fc7d15d24d73cf8737032c5fcc053cc7379
parenta94c68228a29562c382a4587ce9cf18101f9babc (diff)
downloadgem5-17cb191c981ddb5a40f40a14a44e7b7ee7576c0d.tar.xz
tests: use env.Execute instead of Execute to pick up env vars.
-rw-r--r--tests/SConscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/SConscript b/tests/SConscript
index 2d5bd5da0..38e9ae9d2 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -87,7 +87,7 @@ def run_test(target, source, env):
# make sure target files are all gone
for t in target:
if os.path.exists(t.abspath):
- Execute(Delete(t.abspath))
+ env.Execute(Delete(t.abspath))
tgt_dir = os.path.dirname(str(target[0]))
@@ -102,7 +102,7 @@ def run_test(target, source, env):
if env['BATCH']:
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:
# M5 terminated normally.
# 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')
diffcmd = 'diff -ubr %s ${SOURCES[2].dir} %s > %s' \
% (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 contents(outdiff)
# Run diff-out on stats.txt file
@@ -118,7 +118,7 @@ def run_test(target, source, env):
diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \
% (os.path.join(tgt_dir, 'stats.txt'), statsdiff)
diffcmd = env.subst(diffcmd, target=target, source=source)
- status = Execute(diffcmd, strfunction=None)
+ status = env.Execute(diffcmd, strfunction=None)
print "===== Statistics differences ====="
print contents(statsdiff)
@@ -205,7 +205,7 @@ def update_test(target, source, env):
print " Creating new file", f
copyAction = Copy(os.path.join(dest_dir, f), os.path.join(src_dir, f))
copyAction.strfunction = None
- Execute(copyAction)
+ env.Execute(copyAction)
return 0
def update_test_string(target, source, env):