X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=tests%2FSConscript;h=8c9029be609c0c4fa0ea2cfd6bd5b5b74515dc7d;hb=44c6ca84c615e2bedf36ed6f0ac79e0b2795779d;hp=8720939de36b7003e4ae1a1ffbb81a2988199d5f;hpb=bb6af8eb8ad870138030c617f27a1f4193341e8e;p=gem5.git

diff --git a/tests/SConscript b/tests/SConscript
index 8720939de..8c9029be6 100644
--- 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)
@@ -112,11 +114,7 @@ def update_test(target, source, env):
     src_dir = str(source[1].get_dir())
     dest_files = os.listdir(dest_dir)
     src_files = os.listdir(src_dir)
-    # Exclude status & diff outputs
-    for f in ('outdiff', 'statsdiff', 'status'):
-        if f in src_files:
-            src_files.remove(f)
-    for f in src_files:
+    for f in ('stdout', 'stderr', 'm5stats.txt', 'config.ini', 'config.out'):
         if f in dest_files:
             print "  Replacing file", f
             dest_files.remove(f)
@@ -169,6 +167,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]
@@ -202,9 +201,11 @@ if env['FULL_SYSTEM']:
             configs += ['tsunami-simple-atomic',
                         'tsunami-simple-timing',
                         'tsunami-simple-atomic-dual',
-                        'tsunami-simple-timing-dual']
+                        'tsunami-simple-timing-dual',
+			'twosys-tsunami-simple-atomic']
+
 else:
-    configs += ['simple-atomic', 'simple-timing']
+    configs += ['simple-atomic', 'simple-timing', 'o3-timing']
 
 cwd = os.getcwd()
 os.chdir(str(Dir('.').srcdir))