summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-05-22 17:41:34 +0100
committerIan Lynagh <igloo@earth.li>2012-05-22 17:41:34 +0100
commitffe437269c54e2c947b414af117102558d2f84ab (patch)
tree23541a501ddd9c743bae80fe6fb133b1bdd677bf
parent856e916561377094e7061f6eb9b790f06afc2228 (diff)
downloadhaskell-ffe437269c54e2c947b414af117102558d2f84ab.tar.gz
Fix a testsuite driver failure on cygwin
-rw-r--r--testsuite/driver/runtests.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index 07791349a2..bc93355477 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -10,6 +10,17 @@ import platform
import time
import re
+# We don't actually need subprocess in runtests.py, but:
+# * We do need it in testlibs.py
+# * We can't import testlibs.py until after we have imported ctypes
+# * If we import ctypes before subprocess on cygwin, then sys.exit(0)
+# says "Aborted" and we fail with exit code 134.
+# So we import it here first, so that the testsuite doesn't appear to fail.
+try:
+ import subprocess
+except:
+ pass
+
from testutil import *
from testglobals import *