diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-19 13:41:24 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-19 13:41:24 +0200 |
| commit | d576fc38d9493c4979217fa36565f1f97fcc03d4 (patch) | |
| tree | 01a0f1e2b46d840f94e4062c229f8f949d215b5f /testsuite/timeout | |
| parent | abfbb0d6aa65bf6f664fd86eecc72bd3a28bb0b9 (diff) | |
| download | haskell-d576fc38d9493c4979217fa36565f1f97fcc03d4.tar.gz | |
Python 3 support, second attempt (Trac #9184)
Summary:
This is a fixup of https://phabricator.haskell.org/D233
The only difference is in findTFiles (first commit), which
previously broke Windows runner; now I translated literally
instead attempting to improve it, and checked it works.
Test Plan:
I used validate under 2,3 on Linux and under 2 on msys2.
On Windows I've seen a large number of failures, but they don't
seem to be connected with the patch.
Reviewers: hvr, simonmar, thomie, austin
Reviewed By: austin
Subscribers: thomie, carter, ezyang, simonmar
Differential Revision: https://phabricator.haskell.org/D310
GHC Trac Issues: #9184
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 b0d75dac24..f30c628e7a 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 6a57ac2f82..df50806b9b 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, e: + except OSError as e: if e.errno == errno.ECHILD: return else: |