cpu: o3: combine if with same condition

[gem5.git] / tests / SConscript

diff --git a/tests/SConscript b/tests/SConscript
index 5c33e29563cb86acec71cf1493e74b9bfecd98c5..3822de2347647d90a22428af25841bc326379459 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -107,7 +107,7 @@ def run_test(target, source, env):
     # The slowest regression (bzip2) requires ~2.8 hours;
     # 4 hours was chosen to be conservative.
     elif env['TIMEOUT']:
-        cmd = 'timeout 4h %s' % cmd
+        cmd = 'timeout --foreground 4h %s' % cmd
 
     # Create a default value for the status string, changed as needed
     # based on the status.
@@ -354,7 +354,6 @@ if env['TARGET_ISA'] == 'x86':
 
 configs += ['simple-atomic', 'simple-atomic-mp',
             'simple-timing', 'simple-timing-mp',
-            'inorder-timing',
             'minor-timing', 'minor-timing-mp',
             'o3-timing', 'o3-timing-mp',
             'rubytest', 'memtest', 'memtest-filter',