[PATCH] Fix T5435_dyn_asm on mingw and T8832 on 32-bit architecture

transfuturist timothy.schmid at gmail.com
Tue Jun 3 06:06:00 UTC 2014


---
 testsuite/tests/rts/all.T                      | 3 +++
 testsuite/tests/simplCore/should_compile/all.T | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index a56a3f3..c52cea0 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -141,6 +141,9 @@ def checkDynAsm(actual_file, normaliser):
     elif actual == ['ctors1', 'ctors2', 'initArray1', 'initArray2', 'success']:
         if_verbose(1, 'T5435_dyn_asm detected old-style dlopen, see #8458')
         return 1
+    elif opsys('mingw32'):
+        if actual == ['ctors1', 'ctors2', 'success']:
+            return 1
     else:
         if_verbose(1, 'T5435_dyn_asm failed with %s, see all.T for details' % actual)
         return 0
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 616b6cc..ffc7131 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -198,7 +198,8 @@ test('T5996',
      ['$MAKE -s --no-print-directory T5996'])
 test('T8537', normal, compile, [''])
 test('T8832',
-     extra_clean(['T8832.hi', 'T8832a.o']),
+     [extra_clean(['T8832.hi', 'T8832a.o']),
+      when(wordsize(32),expect_broken(8832))],
      run_command,
      ['$MAKE -s --no-print-directory T8832'])
 test('T8848', only_ways(['optasm']), compile, ['-ddump-rule-firings'])
-- 
1.8.4.msysgit.0



More information about the ghc-devs mailing list