[commit: testsuite] master: Suppress some known errors from Mac OS X. (00312aa)

git at git.haskell.org git at git.haskell.org
Sat Sep 14 10:20:56 CEST 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/00312aaa3d1846a40a89ea5285a321bf21c0dc24/testsuite

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

commit 00312aaa3d1846a40a89ea5285a321bf21c0dc24
Author: Edward Z. Yang <ezyang at mit.edu>
Date:   Sat Sep 14 01:20:48 2013 -0700

    Suppress some known errors from Mac OS X.
    
    Signed-off-by: Edward Z. Yang <ezyang at mit.edu>


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

00312aaa3d1846a40a89ea5285a321bf21c0dc24
 tests/codeGen/should_run/all.T |    2 +-
 tests/driver/all.T             |    4 ++--
 tests/ghc-api/T7478/all.T      |    2 +-
 tests/rts/all.T                |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/codeGen/should_run/all.T b/tests/codeGen/should_run/all.T
index 6bbd70f..b51cc30 100644
--- a/tests/codeGen/should_run/all.T
+++ b/tests/codeGen/should_run/all.T
@@ -75,7 +75,7 @@ test('cgrun068', reqlib('random'), compile_and_run, [''])
 test('cgrun069', omit_ways(['ghci']), multi_compile_and_run,
                  ['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
 test('cgrun070', normal, compile_and_run, [''])
-test('cgrun071', normal, compile_and_run, [''])
+test('cgrun071', when(opsys('darwin'), expect_broken(7684)), compile_and_run, [''])
 test('cgrun072', normal, compile_and_run, [''])
 
 test('T1852', normal, compile_and_run, [''])
diff --git a/tests/driver/all.T b/tests/driver/all.T
index ca02b40..a957b74 100644
--- a/tests/driver/all.T
+++ b/tests/driver/all.T
@@ -383,8 +383,8 @@ test('T7563', when(unregisterised(), skip), run_command,
 test('T6037', expect_broken(6037), run_command,
      ['$MAKE -s --no-print-directory T6037'])
 test('T2507',
-     # The testsuite doesn't know how to set a non-Unicode locale on Windows
-     when(opsys('mingw32'), expect_fail),
+     # 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(2507))],
      run_command,
      ['$MAKE -s --no-print-directory T2507'])
 
diff --git a/tests/ghc-api/T7478/all.T b/tests/ghc-api/T7478/all.T
index 5ba40f0..71a4a84 100644
--- a/tests/ghc-api/T7478/all.T
+++ b/tests/ghc-api/T7478/all.T
@@ -1,2 +1,2 @@
-test('T7478', extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi']), run_command, ['$MAKE -s --no-print-directory T7478'])
+test('T7478', [extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi']), when(opsys('darwin'), expect_broken(8294))], run_command, ['$MAKE -s --no-print-directory T7478'])
 
diff --git a/tests/rts/all.T b/tests/rts/all.T
index 227dc82..bd2f6d7 100644
--- a/tests/rts/all.T
+++ b/tests/rts/all.T
@@ -192,7 +192,7 @@ test('T7919', [extra_clean(['T7919A.o','T7919A.hi',
 test('T8035', normal, compile_and_run, [''])
 
 test('linker_unload',
-     [ extra_clean(['Test.o','Test.hi', 'linker_unload']) ],
+     [ extra_clean(['Test.o','Test.hi', 'linker_unload']), when(opsys('mingw32'), expect_broken(8292)), expect_broken(8291) ],
      run_command,
      ['$MAKE -s --no-print-directory linker_unload'])
 




More information about the ghc-commits mailing list