Enable ghci tests for unboxed tupleswip/tuple-tests

The tests were originally skipped because ghci used not to support
unboxed tuples/sums.

3 files changed, 27 insertions, 31 deletions

diff --git a/testsuite/tests/primops/should_run/all.T b/testsuite/tests/primops/should_run/all.T
index da6378df84..0b95b6930a 100644
--- a/testsuite/tests/primops/should_run/all.T
+++ b/testsuite/tests/primops/should_run/all.T
@@ -1,9 +1,8 @@
 test('T6135', normal, compile_and_run, [''])
 test('T7689', normal, compile_and_run, [''])
-# These tests are using unboxed tuples, so omit ghci
-test('T9430', omit_ways(['ghci']), compile_and_run, [''])
+test('T9430', normal, compile_and_run, [''])
 test('T4442',
-     [omit_ways(['ghci']), when(wordsize(32), expect_broken(15184))],
+     [when(wordsize(32), expect_broken(15184))],
      compile_and_run, [''])
 test('T10481', exit_code(1), compile_and_run, [''])
 test('T10678',
@@ -18,13 +17,12 @@ test('T16164', normal, compile_and_run, [''])
 test('ShowPrim', normal, compile_and_run, [''])
 test('T12492', normal, compile_and_run, [''])
 
-# These tests use unboxed tuples, which GHCi doesn't support
-test('ArithInt8', omit_ways(['ghci']), compile_and_run, [''])
-test('ArithWord8', omit_ways(['ghci']), compile_and_run, [''])
-test('ArithInt16', omit_ways(['ghci']), compile_and_run, [''])
-test('ArithWord16', omit_ways(['ghci']), compile_and_run, [''])
-test('ArithInt32', omit_ways(['ghci']), compile_and_run, [''])
-test('ArithWord32', omit_ways(['ghci']), compile_and_run, [''])
+test('ArithInt8', normal, compile_and_run, [''])
+test('ArithWord8', normal, compile_and_run, [''])
+test('ArithInt16', normal, compile_and_run, [''])
+test('ArithWord16', normal, compile_and_run, [''])
+test('ArithInt32', normal, compile_and_run, [''])
+test('ArithWord32', normal, compile_and_run, [''])
 
 test('CmpInt8', normal, compile_and_run, [''])
 test('CmpWord8', normal, compile_and_run, [''])
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index 43bf6bce17..4603013f01 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -122,11 +122,9 @@ test('TypeRep', normal, compile_and_run, [''])
 test('T11120', normal, compile_and_run, [''])
 test('KindInvariant', normal, ghci_script, ['KindInvariant.script'])
 
-# We omit the ghci way in these 3 tests because they use
-# unboxed sums and ghci does not support those yet.
-test('StrictPats', omit_ways(['ghci']), compile_and_run, [''])
-test('T12809', omit_ways(['ghci']), compile_and_run, [''])
-test('EtaExpandLevPoly', [omit_ways(['ghci'])], compile_and_run, [''])
+test('StrictPats', normal, compile_and_run, [''])
+test('T12809', normal, compile_and_run, [''])
+test('EtaExpandLevPoly', normal, compile_and_run, [''])
 
 test('TestTypeableBinary', normal, compile_and_run, [''])
 test('Typeable1', normal, compile_fail, ['-Werror'])
diff --git a/testsuite/tests/unboxedsums/all.T b/testsuite/tests/unboxedsums/all.T
index e6823d8e81..b2069a9d73 100644
--- a/testsuite/tests/unboxedsums/all.T
+++ b/testsuite/tests/unboxedsums/all.T
@@ -3,29 +3,29 @@ test('unboxedsums_unit_tests',
      compile_and_run,
      ['-package ghc'])
 
-test('unarise',       omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums1',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums2',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums3',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums4',  omit_ways(['ghci']), compile_fail, [''])
-test('unboxedsums5',  omit_ways(['ghci']), compile, [''])
-test('unboxedsums6',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums7',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums8',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums9',  omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums10', omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums11', omit_ways(['ghci']), compile_and_run, [''])
-test('unboxedsums12', omit_ways(['ghci']), compile, [''])
+test('unarise',       normal, compile_and_run, [''])
+test('unboxedsums1',  normal, compile_and_run, [''])
+test('unboxedsums2',  omit_ways(['ghci']), compile_and_run, [''])  # broken on ghci because of #23412
+test('unboxedsums3',  normal, compile_and_run, [''])
+test('unboxedsums4',  normal, compile_fail, [''])
+test('unboxedsums5',  normal, compile, [''])
+test('unboxedsums6',  normal, compile_and_run, [''])
+test('unboxedsums7',  normal, compile_and_run, [''])
+test('unboxedsums8',  normal, compile_and_run, [''])
+test('unboxedsums9',  normal, compile_and_run, [''])
+test('unboxedsums10', normal, compile_and_run, [''])
+test('unboxedsums11', normal, compile_and_run, [''])
+test('unboxedsums12', normal, compile, [''])
 
-test('UnboxedSumsTH', [req_th,omit_ways(['ghci'])], compile, [''])
-test('UnboxedSumsTH_Fail', [req_th,omit_ways(['ghci'])], compile_fail, [''])
+test('UnboxedSumsTH', [req_th], compile, [''])
+test('UnboxedSumsTH_Fail', [req_th], compile_fail, [''])
 
 test('ffi1', normal, compile_fail, [''])
 test('thunk', only_ways(['normal']), compile_and_run, [''])
 test('T12375', only_ways(['normal']), compile_and_run, [''])
 test('empty_sum', only_ways(['normal']), compile_and_run, [''])
 test('sum_rr', normal, compile, [''])
-test('T12711', only_ways(['ghci']), ghci_script, ['T12711.script'])
+test('T12711', normal, ghci_script, ['T12711.script'])
 
 test('UbxSumLevPoly', normal, compile, ['-Wno-overlapping-patterns'])
 test('T14051', normal, multi_compile, ['T14051.hs', [('T14051a.hs', '')], '-O2 -v0'])