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/tests/ffi | |
| 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/tests/ffi')
| -rw-r--r-- | testsuite/tests/ffi/should_run/all.T | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index 7efc6eb3d8..6fe087884d 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -50,10 +50,10 @@ test('ffi008', [exit_code(1), omit_ways(['ghci'])], compile_and_run, ['']) maybe_skip = normal opts = '' if config.platform.startswith('i386-'): - if config.compiler_type == 'ghc' and \ + if config.compiler_type == 'ghc' and \ version_ge(config.compiler_version, '6.13'): - opts = '-msse2' - else: + opts = '-msse2' + else: maybe_skip = only_ways(['ghci']) test('ffi009', [when(fast(), skip), @@ -69,9 +69,9 @@ test('ffi011', normal, compile_and_run, ['']) # it. if config.os == 'mingw32': - skip_if_not_windows = normal + skip_if_not_windows = normal else: - skip_if_not_windows = skip + skip_if_not_windows = skip test('ffi012', skip_if_not_windows, compile_and_run, ['']) test('ffi013', normal, compile_and_run, ['']) |