diff options
| author | Reid Barton <rwbarton@gmail.com> | 2014-08-18 22:27:38 -0400 |
|---|---|---|
| committer | Reid Barton <rwbarton@gmail.com> | 2014-08-18 23:14:20 -0400 |
| commit | a72614c40186521da7ba090b102436e61a80b7a7 (patch) | |
| tree | 545335b42897f3c633fad3c545591ccba13cdfe2 | |
| parent | b287bc9bd0afaa26fcd3fe53a49bf86deeb868d8 (diff) | |
| download | haskell-a72614c40186521da7ba090b102436e61a80b7a7.tar.gz | |
Make T8832 operative on 32-bit systems (#8832)
(Also, the 'extra_clean' was unnecessary.)
4 files changed, 16 insertions, 3 deletions
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile index d615a5e8d5..07eedf19fb 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 9059a180cf..d2e4ca0027 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-ws-32 b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32 new file mode 100644 index 0000000000..d09293705f --- /dev/null +++ b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32 @@ -0,0 +1,8 @@ +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.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) diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T index f9a5846eac..c4c32ccd8b 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']) |