Merge zizzer:/bk/newmem

into  zower.eecs.umich.edu:/eecshome/m5/newmem

src/cpu/o3/commit_impl.hh:
    Hand Merge

--HG--
extra : convert_revision : 6984db90d5b5ec71c31f1c345f5a77eed540059e

1 files changed, 4 insertions, 6 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 1228e78d2..8c9029be6 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -114,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)
@@ -205,7 +201,9 @@ 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', 'o3-timing']