[commit: ghc] master: Make T8832 operative on 32-bit systems (#8832) (a72614c)

[git at git.haskell.org]

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

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

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

commit a72614c40186521da7ba090b102436e61a80b7a7
Author: Reid Barton <rwbarton at gmail.com>
Date:   Mon Aug 18 22:27:38 2014 -0400

    Make T8832 operative on 32-bit systems (#8832)
    
    (Also, the 'extra_clean' was unnecessary.)


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

a72614c40186521da7ba090b102436e61a80b7a7
 testsuite/tests/simplCore/should_compile/Makefile                    | 2 +-
 testsuite/tests/simplCore/should_compile/T8832.hs                    | 4 ++++
 .../simplCore/should_compile/{T8832.stdout => T8832.stdout-ws-32}    | 2 --
 testsuite/tests/simplCore/should_compile/all.T                       | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index d615a5e..07eedf1 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/mk/test.mk
 
 T8832:
 	$(RM) -f T8832.o T8832.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl T8832.hs | grep '#'
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl T8832.hs | grep '#'
 
 T7865:
 	$(RM) -f T7865.o T7865.hi
diff --git a/testsuite/tests/simplCore/should_compile/T8832.hs b/testsuite/tests/simplCore/should_compile/T8832.hs
index 9059a18..d2e4ca0 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.hs
+++ b/testsuite/tests/simplCore/should_compile/T8832.hs
@@ -17,12 +17,16 @@ T(i,Int)
 T(i8,Int8)
 T(i16,Int16)
 T(i32,Int32)
+#ifdef T8832_WORDSIZE_64
 T(i64,Int64)
+#endif
 
 T(w,Word)
 T(w8,Word8)
 T(w16,Word16)
 T(w32,Word32)
+#ifdef T8832_WORDSIZE_64
 T(w64,Word64)
+#endif
 
 T(z,Integer)
\ No newline at end of file
diff --git a/testsuite/tests/simplCore/should_compile/T8832.stdout b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
similarity index 79%
copy from testsuite/tests/simplCore/should_compile/T8832.stdout
copy to testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
index 2719631..d092937 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.stdout
+++ b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
@@ -2,9 +2,7 @@ T8832.i = GHC.Types.I# 0
 T8832.i8 = GHC.Int.I8# 0
 T8832.i16 = GHC.Int.I16# 0
 T8832.i32 = GHC.Int.I32# 0
-T8832.i64 = GHC.Int.I64# 0
 T8832.w = GHC.Types.W# (__word 0)
 T8832.w8 = GHC.Word.W8# (__word 0)
 T8832.w16 = GHC.Word.W16# (__word 0)
 T8832.w32 = GHC.Word.W32# (__word 0)
-T8832.w64 = GHC.Word.W64# (__word 0)
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index f9a5846..c4c32cc 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -198,9 +198,10 @@ test('T5996',
      ['$MAKE -s --no-print-directory T5996'])
 test('T8537', normal, compile, [''])
 test('T8832',
-     [when(wordsize(32), expect_fail), extra_clean(['T8832.hi', 'T8832a.o'])],
+     normal,
      run_command,
-     ['$MAKE -s --no-print-directory T8832'])
+     ['$MAKE -s --no-print-directory T8832 T8832_WORDSIZE_OPTS=' +
+      ('-DT8832_WORDSIZE_64' if wordsize(64) else '')])
 test('T8848', only_ways(['optasm']), compile, ['-ddump-rule-firings'])
 test('T8848a', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T8331', only_ways(['optasm']), compile, ['-ddump-rules'])