Commit 3445947a authored by thomie's avatar thomie

Testsuite: delete expect_fail setups for ghc < 7.1

This makes it easier to grep for expect_fail in the tests directory.

Differential Revision: https://phabricator.haskell.org/D965
parent 43ebe24a
......@@ -52,8 +52,7 @@ test('numsparks001', only_ways(['threaded1']), compile_and_run, [''])
test('T4262', [ skip, # skip for now, it doesn't give reliable results
only_ways(['threaded1']),
unless(opsys('linux'),skip),
when(compiler_lt('ghc', '7.1'), expect_fail) ],
unless(opsys('linux'),skip) ],
compile_and_run, [''])
test('T4813', normal, compile_and_run, [''])
......
......@@ -75,7 +75,7 @@ test('GadtOverlap', normal, compile, ['-Wall'])
test('T2395', normal, compile, [''])
test('T4371', normal, compile, [''])
test('T4439', normal, compile, [''])
test('T4488', when(compiler_lt('ghc', '7.1'), expect_fail), compile, [''])
test('T4488', normal, compile, [''])
test('T4870',
[only_ways(['optasm']),
only_compiler_types(['ghc']),
......
......@@ -102,10 +102,10 @@ test('gadt25', normal, compile, [''])
test('T3651', normal, compile_fail, [''])
test('T3638', normal, compile, [''])
test('gadtSyntax001', when(compiler_lt('ghc', '7.1'), expect_fail), compile, [''])
test('gadtSyntaxFail001', when(compiler_lt('ghc', '7.1'), expect_fail), compile_fail, [''])
test('gadtSyntaxFail002', when(compiler_lt('ghc', '7.1'), expect_fail), compile_fail, [''])
test('gadtSyntaxFail003', when(compiler_lt('ghc', '7.1'), expect_fail), compile_fail, [''])
test('gadtSyntax001', normal, compile, [''])
test('gadtSyntaxFail001', normal, compile_fail, [''])
test('gadtSyntaxFail002', normal, compile_fail, [''])
test('gadtSyntaxFail003', normal, compile_fail, [''])
test('T3169', normal, compile_fail, [''])
test('T5424',
extra_clean(['T5424a.hi', 'T5424a.o']),
......
......@@ -159,7 +159,7 @@ test('T4484', normal, compile, [''])
test('T4492', normal, compile, [''])
test('T4494', normal, compile, [''])
test('DataFamDeriv', normal, compile, [''])
test('T1769', when(compiler_lt('ghc', '7.1'), expect_fail), compile, [''])
test('T1769', normal, compile, [''])
test('T4497', normal, compile, [''])
test('T3484', normal, compile, [''])
test('T3460', normal, compile, [''])
......
......@@ -65,7 +65,7 @@ test('T2239', normal, compile, [''])
test('T3440', normal, compile_fail, [''])
test('T4485', normal, compile_fail, [''])
test('T4174', normal, compile_fail, [''])
test('DerivUnsatFam', when(compiler_lt('ghc', '7.1'), expect_fail), compile_fail, [''])
test('DerivUnsatFam', normal, compile_fail, [''])
test('T2664', normal, compile_fail, [''])
test('T2664a', normal, compile, [''])
test('T2544', normal, compile_fail, [''])
......
setTestOpts(only_compiler_types(['ghc']))
test('base01',
[when(compiler_lt('ghc', '7.1'), expect_fail),
normalise_slashes,
[normalise_slashes,
clean_cmd('$MAKE -s clean')],
run_command,
['$MAKE -s base01 --no-print-directory'])
......
......@@ -169,7 +169,7 @@ test('T4240',
['$MAKE -s --no-print-directory T4240'])
test('T4489', normal, compile, [''])
test('T4478', when(compiler_lt('ghc', '7.1'), expect_fail), compile, [''])
test('T4478', normal, compile, [''])
test('T4534', normal, compile, [''])
test('mc09', normal, compile, [''])
......
......@@ -63,8 +63,7 @@ test('T4908', only_ways(['optasm']),
compile,
['-O2 -ddump-simpl -dsuppress-uniques'])
test('T4930', [when(compiler_lt('ghc', '7.1'), expect_fail),
only_ways(['optasm'])],
test('T4930', only_ways(['optasm']),
compile,
['-O -ddump-simpl -dsuppress-uniques'])
......@@ -108,7 +107,7 @@ test('T4918',
['$MAKE -s --no-print-directory T4918'])
test('T4945',
when(compiler_lt('ghc', '7.1'), expect_fail),
normal,
run_command,
['$MAKE -s --no-print-directory T4945'])
......
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