[commit: ghc] master: T4006, environment001, T3307 all work on msys2 (b95dbb5)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b95dbb516616ed9a1f7b7263a78455ddaa7e80fd/ghc

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

commit b95dbb516616ed9a1f7b7263a78455ddaa7e80fd
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed May 28 09:12:34 2014 +0100

    T4006, environment001, T3307 all work on msys2


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

b95dbb516616ed9a1f7b7263a78455ddaa7e80fd
 libraries/base/tests/IO/all.T | 6 ++----
 libraries/base/tests/all.T    | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 94d75f0..e15c84d 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -121,8 +121,7 @@ test('concio002', reqlib('process'), compile_and_run, [''])
 
 test('T2122', extra_clean(['T2122-test']), compile_and_run, [''])
 test('T3307',
-     [when(msys(), expect_fail), # Doesn't work on MSYS; see #5599
-      extra_clean(['chinese-file-小说', 'chinese-name'])],
+     [extra_clean(['chinese-file-小说', 'chinese-name'])],
      run_command,
      ['$MAKE -s --no-print-directory T3307-test'])
 test('T4855', normal, compile_and_run, [''])
@@ -148,8 +147,7 @@ test('encoding003', normal, compile_and_run, [''])
 test('encoding004', normal, compile_and_run, [''])
 
 test('environment001',
-     [when(msys(), expect_fail), # Doesn't work on MSYS; see #5599
-      extra_clean(['environment001'])],
+     [extra_clean(['environment001'])],
      run_command,
      ['$MAKE -s --no-print-directory environment001-test'])
 
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 21e3d0c..31c6344 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -114,7 +114,8 @@ test('weak001', normal, compile_and_run, [''])
 #     cat: write error: Permission denied
 # Seems to be a known problem, e.g.
 #     http://mingw-users.1079350.n2.nabble.com/Bug-re-Unicode-on-the-console-td3121717.html
-test('T4006', when(msys(), expect_fail), compile_and_run, [''])
+# May 2014: seems to work on msys2
+test('T4006', normal, compile_and_run, [''])
 
 test('T5943', normal, compile_and_run, [''])
 test('T5962', normal, compile_and_run, [''])