diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-03 19:18:38 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-03 19:18:38 +0200 |
| commit | e4a597f2f527ba0cd15cb51dda15cb51871c984e (patch) | |
| tree | 6d80230a83eee135e8a0b19d2a3e08725f441f81 /testsuite/timeout | |
| parent | 582217fc25167afa0111c398aca65727a9dd9b6e (diff) | |
| download | haskell-e4a597f2f527ba0cd15cb51dda15cb51871c984e.tar.gz | |
Revert "Basic Python 3 support for testsuite driver (Trac #9184)"
This reverts commit 084d241b316bfa12e41fc34cae993ca276bf0730.
This is a possible culprit of Windows breakage reported at ghc-devs.
Diffstat (limited to 'testsuite/timeout')
| -rw-r--r-- | testsuite/timeout/calibrate | 2 | ||||
| -rw-r--r-- | testsuite/timeout/timeout.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/timeout/calibrate b/testsuite/timeout/calibrate index f30c628e7a..b0d75dac24 100644 --- a/testsuite/timeout/calibrate +++ b/testsuite/timeout/calibrate @@ -10,7 +10,7 @@ except: # We don't have resource, so this is a non-UNIX machine. # It's probably a reasonable modern x86/x86_64 machines, so we'd # probably calibrate to 300 anyway; thus just print 300. - print(300) + print 300 exit(0) compiler = argv[1] diff --git a/testsuite/timeout/timeout.py b/testsuite/timeout/timeout.py index df50806b9b..6a57ac2f82 100644 --- a/testsuite/timeout/timeout.py +++ b/testsuite/timeout/timeout.py @@ -21,7 +21,7 @@ try: os.killpg(pid, signal.SIGKILL) else: return - except OSError as e: + except OSError, e: if e.errno == errno.ECHILD: return else: |