Commit f93b31dc authored by Ian Lynagh's avatar Ian Lynagh

Remove special results for old GHC versions

parent 9a1b350e
......@@ -7,5 +7,5 @@ test('PList1', expect_broken(4295), compile, [''])
test('PList2', expect_broken(4295), compile, [''])
test('SystemF', expect_broken(4295), compile, [''])
test('boxy', expect_broken(4295), compile, [''])
test('Compose', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T2193', if_compiler_lt('ghc', '6.11', expect_fail), compile_and_run, [''])
test('Compose', normal, compile, [''])
test('T2193', normal, compile_and_run, [''])
......@@ -69,8 +69,8 @@ test('ds062', normal, compile, [''])
test('ds063', normal, compile, [''])
test('T2409', normal, compile, [''])
test('T3263-1', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-fwarn-unused-do-bind -XRecursiveDo'])
test('T3263-2', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-fwarn-wrong-do-bind -XScopedTypeVariables -XRecursiveDo'])
test('T3263-1', normal, compile, ['-fwarn-unused-do-bind -XRecursiveDo'])
test('T3263-2', normal, compile, ['-fwarn-wrong-do-bind -XScopedTypeVariables -XRecursiveDo'])
test('GadtOverlap', normal, compile, ['-Wall'])
test('T2395', normal, compile, [''])
......
......@@ -18,19 +18,13 @@ test('drv021', normal, compile, [''])
test('deriving-1935', normal, compile, [''])
test('T2378', normal, compile, [''])
test('T2856', normal, compile, [''])
test('T3057', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T3057', normal, compile, [''])
test('T3012', normal, compile, [''])
test('T3965', normal, compile, [''])
test('T4220', normal, compile, [''])
test('T4302', normal, compile, [''])
test('T4325', normal, compile, [''])
test('drv-functor1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile,
[''])
test('drv-functor1', normal, compile, [''])
test('drv-functor2', normal, compile, [''])
test('drv-foldable-traversable1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile,
[''])
test('drv-foldable-traversable1', normal, compile, [''])
......@@ -25,16 +25,9 @@ test('T2851', normal, compile_fail, [''])
test('T2721', normal, compile_fail, [''])
test('T3101', normal, compile_fail, [''])
test('T3621', normal, compile_fail, [''])
test('drvfail-functor1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_fail,
[''])
test('drvfail-functor2',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_fail, [''])
test('drvfail-foldable-traversable1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_fail,
test('drvfail-functor1', normal, compile_fail, [''])
test('drvfail-functor2', normal, compile_fail, [''])
test('drvfail-foldable-traversable1', normal, compile_fail,
[''])
test('T3833', normal, compile_fail, [''])
test('T3834', normal, compile_fail, [''])
......@@ -25,18 +25,8 @@ test('drvrun019', normal, compile_and_run, [''])
test('drvrun020', normal, compile_and_run, [''])
test('drvrun021', normal, compile_and_run, [''])
test('drvrun022', reqlib('syb'), compile_and_run, ['-package syb'])
test('T3087',
[if_compiler_lt('ghc', '6.11', expect_fail),
reqlib('syb')],
compile_and_run,
['-package syb'])
test('T3087', reqlib('syb'), compile_and_run, ['-package syb'])
test('T2529', normal, compile_and_run, [''])
test('drvrun-functor1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_and_run,
[''])
test('drvrun-foldable1',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_and_run,
[''])
test('drvrun-functor1', normal, compile_and_run, [''])
test('drvrun-foldable1', normal, compile_and_run, [''])
test('T4136', normal, compile_and_run, [''])
......@@ -127,19 +127,19 @@ test('T2448', normal, compile, [''])
test('T2291', normal, compile, [''])
test('T2639', normal, compile, [''])
test('T2944', normal, compile, [''])
test('T3017', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-ddump-types'])
test('TF_GADT', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T2203b', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T2767', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T3208a', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T3017', normal, compile, ['-ddump-types'])
test('TF_GADT', normal, compile, [''])
test('T2203b', normal, compile, [''])
test('T2767', normal, compile, [''])
test('T3208a', normal, compile, [''])
test('T3208b', expect_fail, compile, [''])
test('T3418', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T3418', normal, compile, [''])
test('T3423', normal, compile, [''])
test('T2850', normal, compile, [''])
test('T3220', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('T3220', normal, compile, [''])
test('T3590', normal, compile, [''])
test('CoTest3', if_compiler_lt('ghc', '6.13', expect_fail), compile, [''])
test('Roman1', if_compiler_lt('ghc', '6.13', expect_fail), compile, [''])
test('CoTest3', normal, compile, [''])
test('Roman1', normal, compile, [''])
test('T4160', normal, compile, [''])
test('IndTypesPerf',
extra_clean(['IndTypesPerf.o', 'IndTypesPerf.hi',
......
......@@ -3,8 +3,7 @@ test('char002', normal, compile_and_run, [''])
test('length001',
# This fails without -O, as it relies on a RULE being applied
[expect_fail_for(['normal', 'ghci', 'threaded1', 'llvm']),
if_compiler_lt('ghc', '6.11', expect_fail)],
expect_fail_for(['normal', 'ghci', 'threaded1', 'llvm']),
compile_and_run,
[''])
......
......@@ -76,12 +76,8 @@ test('read061', normal, compile, [''])
test('read062', normal, compile, [''])
test('read063', normal, compile, [''])
test('read064', normal, compile, [''])
test('read065',
[if_compiler_lt('ghc', '6.11', skip),
omit_ways(['optc', 'profc'])],
compile,
[''])
test('read066', if_compiler_le('ghc', '6.10.1', expect_fail), compile, [''])
test('read065', omit_ways(['optc', 'profc']), compile, [''])
test('read066', normal, compile, [''])
test('read067', normal, compile, [''])
test('read068', normal, compile, [''])
test('read_1821', normal, compile, [''])
......
......@@ -51,8 +51,8 @@ test('readFail041', normal, compile_fail, [''])
test('readFail042', normal, compile_fail, [''])
test('readFail043', normal, compile_fail, [''])
test('readFail044', normal, compile_fail, [''])
test('readFail045', if_compiler_lt('ghc', '6.11', skip), compile_fail, [''])
test('readFail046', if_compiler_lt('ghc', '6.13', skip), compile_fail, [''])
test('readFail045', normal, compile_fail, [''])
test('readFail046', normal, compile_fail, [''])
test('T3095', normal, compile_fail, [''])
test('T3153', normal, compile_fail, [''])
test('T3751', normal, compile_fail, [''])
......
......@@ -6,10 +6,6 @@ test('qq005',
# profiling ways, due to the TH use, so for now we just
# omit the profiling ways
omit_ways(['profc','profasm','profthreaded']),
# Omit the hpc way for 6.10 due to #1779
# Unfortunately this requires repeating the prof ways again
if_compiler_lt('ghc', '6.11',
omit_ways(['hpc','profc','profasm','profthreaded'])),
extra_clean(['Expr.hi', 'Expr.o', 'Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
......@@ -65,7 +65,7 @@ test('rnfail055',
'RnFail055_aux.hi', 'RnFail055_aux.o']),
multimod_compile_fail,
['RnFail055','-v0'])
test('rnfail056', if_compiler_lt('ghc', '6.11', expect_fail), compile_fail, [''])
test('rnfail056', normal, compile_fail, [''])
test('rn_dup', normal, compile_fail, [''])
test('T2310', normal, compile_fail, [''])
......
......@@ -34,9 +34,7 @@ test('spec002', normal, compile, [''])
test('spec003', normal, compile, [''])
test('rule1', normal, compile, [''])
test('rule2', [only_ways(['optc','optasm']),
if_compiler_lt('ghc', '6.13', expect_fail)],
compile, ['-dsuppress-uniques'])
test('rule2', only_ways(['optc','optasm']), compile, ['-dsuppress-uniques'])
test('dfun-loop', normal, compile, [''])
test('strict-float', normal, compile, [''])
......@@ -63,8 +61,7 @@ test('spec-inline', only_ways(['optc','optasm']),
['-O2 -ddump-simpl -dsuppress-uniques'])
test('T3055',
[extra_clean(['T3055.hi', 'T3055.o', 'T3055.simpl']),
if_compiler_lt('ghc', '6.11', expect_fail)],
extra_clean(['T3055.hi', 'T3055.o', 'T3055.simpl']),
run_command,
['$MAKE -s --no-print-directory T3055'])
......
......@@ -101,8 +101,7 @@ test('TH_bracket3', normal, compile, [''])
test('TH_class1', normal, compile, ['-v0'])
test('TH_tuple1', normal, compile, ['-v0'])
test('TH_genEx',
[extra_clean(['TH_genExLib.hi', 'TH_genExLib.o']),
if_compiler_lt('ghc', '6.11', expect_fail)],
extra_clean(['TH_genExLib.hi', 'TH_genExLib.o']),
multimod_compile,
['TH_genEx', '-v0'])
......@@ -145,14 +144,11 @@ test('T2685', extra_clean(['T2685a.hi','T2685a.o']),
test('TH_sections', normal, compile, ['-v0'])
test('TH_tf1', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-v0'])
test('TH_tf2', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-v0'])
test('TH_tf3', if_compiler_lt('ghc', '6.11', expect_fail), compile, ['-v0'])
test('TH_tf1', normal, compile, ['-v0'])
test('TH_tf2', normal, compile, ['-v0'])
test('TH_tf3', normal, compile, ['-v0'])
test('TH_pragma',
if_compiler_lt('ghc', '6.11', expect_fail),
compile,
['-v0 -dsuppress-uniques'])
test('TH_pragma', normal, compile, ['-v0 -dsuppress-uniques'])
test('T3177', normal, compile, ['-v0'])
test('T3177a', normal, compile_fail, ['-v0'])
......
......@@ -222,10 +222,10 @@ test('tc207', normal, compile, [''])
test('tc208', normal, compile, [''])
test('tc209', normal, compile, [''])
test('tc210', normal, compile, [''])
test('tc211', if_compiler_lt('ghc', '6.11', expect_fail), compile_fail, [''])
test('tc211', normal, compile_fail, [''])
test('tc212', normal, compile, [''])
test('tc213', normal, compile, [''])
test('tc214', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('tc214', normal, compile, [''])
test('tc215', normal, compile, [''])
test('tc216', normal, compile_fail, [''])
test('tc217', reqlib('mtl'), compile, [''])
......@@ -258,10 +258,9 @@ test('tc240', normal, compile, [''])
test('tc241', normal, compile, [''])
test('tc242', normal, compile, [''])
test('tc243', normal, compile, [''])
test('tc244', if_compiler_lt('ghc', '6.11', expect_fail), compile, [''])
test('tc244', normal, compile, [''])
test('tc245',
[extra_clean(['Tc245_A.hi', 'Tc245_A.o', 'tc245.hi', 'tc245.o']),
if_compiler_lt('ghc', '6.11', expect_fail)],
extra_clean(['Tc245_A.hi', 'Tc245_A.o', 'tc245.hi', 'tc245.o']),
run_command,
['$MAKE -s --no-print-directory tc245'])
test('tc246', normal, compile, [''])
......
......@@ -161,10 +161,7 @@ test('tcfail170', normal, compile_fail, [''])
test('tcfail171', normal, compile_fail, [''])
test('tcfail172', normal, compile, [''])
test('tcfail173', normal, compile_fail, [''])
test('tcfail174',
if_compiler_lt('ghc', '6.11', expect_fail),
compile_fail,
[''])
test('tcfail174', normal, compile_fail, [''])
test('tcfail175', normal, compile_fail, [''])
test('tcfail176', normal, compile_fail, [''])
test('tcfail177', normal, compile_fail, [''])
......@@ -181,8 +178,7 @@ test('tcfail186',
multimod_compile_fail, ['tcfail186', '-v0'])
test('tcfail187', normal, compile_fail, [''])
test('tcfail188', if_compiler_lt('ghc', '6.13', expect_fail), compile, [''])
# Now that #959 is fixed, tcfail188 should compile
test('tcfail188', normal, compile, [''])
test('tcfail189', normal, compile_fail, [''])
test('tcfail190', normal, compile_fail, [''])
......@@ -201,7 +197,7 @@ test('tcfail202', normal, compile_fail, [''])
test('tcfail203', normal, compile, [''])
test('tcfail203a', normal, compile_fail, [''])
test('tcfail204', normal, compile_fail, [''])
test('tcfail206', if_compiler_lt('ghc', '6.11', expect_fail), compile_fail, [''])
test('tcfail206', normal, compile_fail, [''])
test('T1899', normal, compile_fail, [''])
test('T2126', normal, compile_fail, [''])
......
......@@ -64,8 +64,8 @@ test('tcrun038',
test('tcrun039', only_compiler_types(['ghc']), compile_and_run, [''])
test('tcrun040', normal, compile_and_run, [''])
test('tcrun041', compose(omit_ways(['ghci']), if_compiler_lt('ghc', '6.11', expect_fail)), compile_and_run, [''])
test('tcrun042', if_compiler_lt('ghc', '6.11', expect_fail), compile_and_run, [''])
test('tcrun041', omit_ways(['ghci']), compile_and_run, [''])
test('tcrun042', normal, compile_and_run, [''])
test('church', normal, compile_and_run, [''])
test('testeq2', normal, compile_and_run, [''])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment