[commit: ghc] ghc-7.10: Testsuite: mark T6037 expect_fail on Windows (#6037) (6f1ac16)

git at git.haskell.org git at git.haskell.org
Thu Oct 22 15:08:39 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/6f1ac160c5bb32a6c862a79c047ac1c1803c7879/ghc

>---------------------------------------------------------------

commit 6f1ac160c5bb32a6c862a79c047ac1c1803c7879
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Sep 12 23:34:12 2015 +0200

    Testsuite: mark T6037 expect_fail on Windows (#6037)


>---------------------------------------------------------------

6f1ac160c5bb32a6c862a79c047ac1c1803c7879
 testsuite/tests/driver/Makefile | 4 ++--
 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 e12f3a5..52f0d9d 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 6b07d47..4690ef1 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -384,7 +384,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',



More information about the ghc-commits mailing list