[commit: ghc] master: Testsuite: delete expect_fail setups for ghc < 7.1 (3445947)
git at git.haskell.org
git at git.haskell.org
Tue Jun 9 11:26:45 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/3445947ae380967b4032233273fdb54d41bce157/ghc
>---------------------------------------------------------------
commit 3445947ae380967b4032233273fdb54d41bce157
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Wed Jun 3 14:55:20 2015 +0200
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
>---------------------------------------------------------------
3445947ae380967b4032233273fdb54d41bce157
testsuite/tests/concurrent/should_run/all.T | 3 +--
testsuite/tests/deSugar/should_compile/all.T | 2 +-
testsuite/tests/gadt/all.T | 8 ++++----
testsuite/tests/indexed-types/should_compile/all.T | 2 +-
testsuite/tests/indexed-types/should_fail/all.T | 2 +-
testsuite/tests/module/base01/all.T | 3 +--
testsuite/tests/rename/should_compile/all.T | 2 +-
testsuite/tests/simplCore/should_compile/all.T | 5 ++---
8 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index e72bffe..5288ff9 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -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, [''])
diff --git a/testsuite/tests/deSugar/should_compile/all.T b/testsuite/tests/deSugar/should_compile/all.T
index 956f951..2f890f5 100644
--- a/testsuite/tests/deSugar/should_compile/all.T
+++ b/testsuite/tests/deSugar/should_compile/all.T
@@ -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']),
diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T
index 315ecb6..cbbc0fc 100644
--- a/testsuite/tests/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
@@ -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']),
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index 27bb853..aaf89e9 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -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, [''])
diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T
index 6615c02..069b5a6 100644
--- a/testsuite/tests/indexed-types/should_fail/all.T
+++ b/testsuite/tests/indexed-types/should_fail/all.T
@@ -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, [''])
diff --git a/testsuite/tests/module/base01/all.T b/testsuite/tests/module/base01/all.T
index 6fa3e5c..1d1560b 100644
--- a/testsuite/tests/module/base01/all.T
+++ b/testsuite/tests/module/base01/all.T
@@ -1,8 +1,7 @@
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'])
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index aa29c43..4bd4e0a 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -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, [''])
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index daf038a..1f7dffa 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -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'])
More information about the ghc-commits
mailing list