Merge zizzer.eecs.umich.edu:/bk/newmem

[gem5.git] / tests / SConscript

diff --git a/tests/SConscript b/tests/SConscript
index 8720939de36b7003e4ae1a1ffbb81a2988199d5f..1228e78d28e58ee753fe7315b4ef965b4d669c8c 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -61,10 +61,12 @@ 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
+                      '-I "listening for remote gdb" ' + # for stderr file
                       '--exclude=m5stats.txt --exclude=SCCS ' +
                       '--exclude=${TARGETS[0].file} ' +
                       '> ${TARGETS[0]}', target=target, source=source), None)
@@ -169,6 +171,7 @@ def test_builder(env, ref_dir):
     # Prefix test run with batch job submission command if appropriate.
     # Output redirection is also different for batch runs.
     # Batch command also supports timeout arg (in seconds, not minutes).
+    timeout = 15 # used to be a param, probably should be again
     if env['BATCH']:
         cmd = [env['BATCH_CMD'], '-t', str(timeout * 60),
                '-o', cmd_stdout, '-e', cmd_stderr, base_cmd]
@@ -204,7 +207,7 @@ if env['FULL_SYSTEM']:
                         'tsunami-simple-atomic-dual',
                         'tsunami-simple-timing-dual']
 else:
-    configs += ['simple-atomic', 'simple-timing']
+    configs += ['simple-atomic', 'simple-timing', 'o3-timing']
 
 cwd = os.getcwd()
 os.chdir(str(Dir('.').srcdir))