diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-12 23:34:12 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-12 23:43:15 +0200 |
| commit | c8d438fb027cbefa31941d8397539c481a03a74f (patch) | |
| tree | da64740e52180c460731007d1545aaf778f4b585 | |
| parent | 08af42fd0a30516e0a0ec981af5cc3d165f75a5a (diff) | |
| download | haskell-c8d438fb027cbefa31941d8397539c481a03a74f.tar.gz | |
Testsuite: mark T6037 expect_fail on Windows (#6037)
| -rw-r--r-- | testsuite/tests/driver/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/driver/all.T | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index dc1238c005..50696a7052 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -551,8 +551,8 @@ T7563: -"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -C T7563.hs # Below we set LC_ALL=C to request standard ASCII output in the resulting error -# messages. Unfortunately, Mac OS X still uses a Unicode encoding even with -# LC_ALL=C, so we expect these tests to fail there. +# messages. Unfortunately, Mac OS X and Windows still use a Unicode encoding +# even with LC_ALL=C, so we expect these tests to fail there. .PHONY: T6037 T6037: diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index a11c0f1872..4a4f93003e 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -382,7 +382,10 @@ test('T7060', test('T7130', normal, compile_fail, ['-fflul-laziness']) test('T7563', when(unregisterised(), skip), run_command, ['$MAKE -s --no-print-directory T7563']) -test('T6037', normal, run_command, +test('T6037', + # The testsuite doesn't know how to set a non-Unicode locale on Windows or Mac OS X + [when(opsys('mingw32'), expect_fail), when(opsys('darwin'), expect_fail)], + run_command, ['$MAKE -s --no-print-directory T6037']) test('T2507', # The testsuite doesn't know how to set a non-Unicode locale on Windows or Mac OS X |