fix

1 files changed, 6 insertions, 18 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index d3b902ca4e6..b84af286444 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -16,13 +16,6 @@
 import os, sys
 import getopt
 
-#
-# I must import "time" here, otherwise I get a "NameError: global name
-# 'time' is not defined" in the IceStorm run.py scripts. I have no
-# idea why.
-#
-import time
-
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
     if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
@@ -30,9 +23,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
 else:
     raise "can't find toplevel directory!"
 
-sys.path.append(os.path.join(toplevel, "config"))
-import TestUtil
-
 def runTests(tests, num = 0):
 
     #
@@ -49,14 +39,12 @@ def runTests(tests, num = 0):
 	print "*** running tests in " + dir,
 	print
 
-	try:
-	    execfile(os.path.join(dir, "run.py"))
-	except SystemExit, (status,):
-	    if status:
-		if(num > 0):
-		    print "[" + str(num) + "]",
-		print "test in " + dir + " failed with exit status", status,
-		sys.exit(status)
+	status = os.system(os.path.join(dir, "run.py"))
+	if status:
+	    if(num > 0):
+		print "[" + str(num) + "]",
+	    print "test in " + dir + " failed with exit status", status,
+	    sys.exit(status)
 
 #
 # List of all basic tests.