diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-01 23:41:27 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-01 23:41:27 +0200 |
| commit | 084d241b316bfa12e41fc34cae993ca276bf0730 (patch) | |
| tree | 2c51250374dd6419d2c2db2c16e3dff06c7206e9 /testsuite/timeout | |
| parent | 2a8856884de7d476e26b4ffa829ccb3a14d6f63e (diff) | |
| download | haskell-084d241b316bfa12e41fc34cae993ca276bf0730.tar.gz | |
Basic Python 3 support for testsuite driver (Trac #9184)
Summary:
Most of the changes is adaptation of old Python 2 only code.
My priority was not breaking Python 2, and so I avoided bigger
changes to the driver. In particular, under Python 3 the output
is a str and buffering cannot be disabled.
To test, define PYTHON=python3 in testsuite/mk/boilerplate.mk.
Thanks to aspidites <emarshall85@gmail.com> who provided the initial patch.
Test Plan: validate under 2 and 3
Reviewers: hvr, simonmar, thomie, austin
Reviewed By: thomie, austin
Subscribers: aspidites, thomie, simonmar, ezyang, carter
Differential Revision: https://phabricator.haskell.org/D233
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: |