Removed exit(1) for killServers() under Cygwin.

1 files changed, 12 insertions, 4 deletions

diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 726b6afb36c..99e16091eca 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -110,11 +110,19 @@ def killServers():
 
     global serverPids
 
+    if isCygwin():
+	print "killServers(): not implemented for cygwin python."
+
+	#
+	# TODO: Michi: Not sure why exit(1) was here. This means that, when
+	# we run the test suite with allTests.py under Cygwin, the first sub-test that
+	# calls killServers will return non-zero exit status and, therefore,
+	# terminate allTests.py, so the subsequence tests are never run.
+	#
+	#sys.exit(1)
+
     for pid in serverPids:
-        if isCygwin():
-            print "killServers(): not implemented for cygwin python."
-            sys.exit(1)
-        elif isWin32():
+        if isWin32():
             try:
                 import win32api
                 handle = win32api.OpenProcess(1, 0, pid)