runtest fixes

8 files changed, 23 insertions, 15 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index 33902177f9c..294bd044161 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -9,7 +9,7 @@
 #
 # **********************************************************************
 
-import os
+import os, sys
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     if os.path.exists(os.path.normpath(toplevel + "/config/TestUtil.py")):
@@ -34,4 +34,12 @@ for i in \
     print "*** running tests in " + dir + ":"
     print
 
-    os.system("python " + os.path.normpath(dir + "/run.py"))
+    try:
+        execfile(os.path.normpath(dir + "/run.py"))
+    except SystemExit, (ex,):
+        if ex:
+            sys.exit(ex)
+
+
+
+        
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 6c473b14f06..d2e5ded9463 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -36,7 +36,7 @@ def getServerPid(serverPipe):
     if not output:
         print "failed!"
         killServers()
-        sys.exit(0)
+        sys.exit(1)
 
     serverPids.append(int(output))
 
@@ -47,7 +47,7 @@ def getAdapterReady(serverPipe):
     if not output:
         print "failed!"
         killServers()
-        sys.exit(0)
+        sys.exit(1)
     
 
 def clientServerTest(toplevel, name):
@@ -68,7 +68,7 @@ def clientServerTest(toplevel, name):
     if not output:
 	print "failed!"
 	killServers()
-	sys.exit(0)
+	sys.exit(1)
     print "ok"
     print output,
     while 1:
@@ -87,6 +87,6 @@ def collocatedTest(toplevel, name):
     output = collocatedPipe.read().strip()
     if not output:
         print "failed!"
-        sys.exit(0)
+        sys.exit(1)
     print "ok"
     print output
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index 2873635c052..e86eacd0b8d 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -23,4 +23,4 @@ import TestUtil
 name = "Ice/exceptions"
 TestUtil.clientServerTest(toplevel, name)
 TestUtil.collocatedTest(toplevel, name)
-sys.exit(1)
+sys.exit(0)
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 2594e582419..54c8a21422e 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -44,7 +44,7 @@ output = clientPipe.readline()
 if not output:
     print "failed!"
     TestUtil.killServers()
-    sys.exit(0)
+    sys.exit(1)
 print "ok"
 print output,
 while 1:
@@ -53,4 +53,4 @@ while 1:
 	break;
     print output,
 
-sys.exit(1)
+sys.exit(0)
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index f687cef2beb..6796ea3b6cf 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -23,4 +23,4 @@ import TestUtil
 name = "Ice/inheritance"
 TestUtil.clientServerTest(toplevel, name)
 TestUtil.collocatedTest(toplevel, name)
-sys.exit(1)
+sys.exit(0)
diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py
index 10c3f160611..a3dd4cc9336 100755
--- a/cpp/test/Ice/locationForward/run.py
+++ b/cpp/test/Ice/locationForward/run.py
@@ -47,7 +47,7 @@ output = clientPipe.readline()
 if not output:
     print "failed!"
     TestUtil.killServers()
-    sys.exit(0)
+    sys.exit(1)
 print "ok"
 print output,
 while 1:
@@ -56,4 +56,4 @@ while 1:
 	break;
     print output,
 
-sys.exit(1)
+sys.exit(0)
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index 4117811f191..eb0815fe726 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -23,4 +23,4 @@ import TestUtil
 name = "Ice/operations"
 TestUtil.clientServerTest(toplevel, name)
 TestUtil.collocatedTest(toplevel, name)
-sys.exit(1)
+sys.exit(0)
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 806d7896c83..2534d776436 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -61,7 +61,7 @@ if os.name != "nt":
     if not output:
         print "failed!"
         TestUtil.killServers()
-        sys.exit(0)
+        sys.exit(1)
     print "ok"
     print output,
     while 1:
@@ -77,4 +77,4 @@ icePackAdminPipe = os.popen(icePackAdmin + \
 icePackAdminPipe.close()
 print "ok"
 
-sys.exit(1)
+sys.exit(0)