summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 14:16:52 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 14:16:52 -0700
commitdf3af8018e5a252f7c4e8f52b872263c8ab375cc (patch)
treebdc61fb372fc0f8e603cbcdf97e5d3883accf5a5 /tests
parent597ef651df487937399e371fd11711cb8908b581 (diff)
downloadgem5-df3af8018e5a252f7c4e8f52b872263c8ab375cc.tar.xz
Minor regression fixes.
src/python/m5/objects/BaseCPU.py: bug fix tests/SConscript: fix up diff ignore strings to reflect changes in m5 output --HG-- extra : convert_revision : b8e4acee34599ddd431b69fc9d40b6f6e440d128
Diffstat (limited to 'tests')
-rw-r--r--tests/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/SConscript b/tests/SConscript
index 8720939de..d5968d3e3 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -61,8 +61,9 @@ def check_test(target, source, env):
# Exclude m5stats.txt since we will use diff-out on that.
Execute(env.subst('diff -ubr ${SOURCES[0].dir} ${SOURCES[1].dir} ' +
'-I "^command line:" ' + # for stdout file
- '-I "^M5 compiled on" ' + # for stderr file
- '-I "^M5 simulation started" ' + # for stderr file
+ '-I "^M5 compiled " ' + # for stderr file
+ '-I "^M5 started " ' + # for stderr file
+ '-I "^M5 executing on " ' + # for stderr file
'-I "^Simulation complete at" ' + # for stderr file
'-I "^Listening for" ' + # for stderr file
'--exclude=m5stats.txt --exclude=SCCS ' +