Minor tweak to regression exit status message.

[gem5.git] / tests / run.py

diff --git a/tests/run.py b/tests/run.py
index df34faca811ed306a7f9821fd18bc2c3ea8d6ef2..df26c88c5f51580fd3ea956682548d7c9bab8d27 100644 (file)
--- a/tests/run.py
+++ b/tests/run.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,14 +26,22 @@
 #
 # Authors: Steve Reinhardt
 
-import os, sys
+import os
+import sys
+import m5
+
+# Since we're in batch mode, dont allow tcp socket connections
+m5.disableAllListeners()
 
 # single "path" arg encodes everything we need to know about test
-(category, name, isa, opsys, config) = sys.argv[1].split('/')
+(category, name, isa, opsys, config) = sys.argv[1].split('/')[-5:]
 
 # find path to directory containing this file
 tests_root = os.path.dirname(__file__)
-test_progs = os.path.join(tests_root, 'test-progs')
+if os.path.isdir('/dist/m5/regression/test-progs'):
+    test_progs = '/dist/m5/regression/test-progs'
+else:
+    test_progs = os.path.join(tests_root, 'test-progs')
 
 # generate path to binary file
 def binpath(app, file=None):
@@ -54,8 +62,7 @@ execfile(os.path.join(tests_root, 'configs', config + '.py'))
 
 # set default maxtick... script can override
 # -1 means run forever
-from m5 import MaxTick
-maxtick = MaxTick
+maxtick = m5.MaxTick
 
 # tweak configuration for specific test