summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-02-16 14:17:35 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2016-02-17 15:04:18 +0100
commit6f25fb32d16f716c8e0da4ba950f2ff90b272108 (patch)
treedc58e16bb26de5261885c995083763eb81274415 /testsuite/tests
parent2b906af0dab01c30c28792d39161e01449b85cb0 (diff)
downloadhaskell-6f25fb32d16f716c8e0da4ba950f2ff90b272108.tar.gz
Testsuite: delete compiler_lt/le/gt/ge setup functions
Since we're not consisently keeping track of which tests should pass with which compiler versions, there is no point in keeping these functions. Update submodules containers, hpc and stm.
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/codeGen/should_run/all.T7
-rw-r--r--testsuite/tests/deSugar/should_run/all.T9
-rw-r--r--testsuite/tests/ghc-api/show-srcspan/all.T2
-rw-r--r--testsuite/tests/ghci.debugger/scripts/all.T2
-rw-r--r--testsuite/tests/ghci/should_fail/all.T2
-rw-r--r--testsuite/tests/indexed-types/should_run/all.T2
-rw-r--r--testsuite/tests/parser/should_compile/all.T4
-rw-r--r--testsuite/tests/parser/should_fail/all.T4
-rw-r--r--testsuite/tests/parser/should_run/all.T6
-rw-r--r--testsuite/tests/partial-sigs/should_fail/all.T2
-rw-r--r--testsuite/tests/plugins/all.T1
-rw-r--r--testsuite/tests/pmcheck/should_compile/all.T2
-rw-r--r--testsuite/tests/rebindable/all.T2
-rw-r--r--testsuite/tests/rename/should_fail/all.T9
-rw-r--r--testsuite/tests/rts/all.T10
-rw-r--r--testsuite/tests/simplCore/should_fail/all.T2
-rw-r--r--testsuite/tests/th/all.T9
-rw-r--r--testsuite/tests/typecheck/should_compile/all.T8
-rw-r--r--testsuite/tests/typecheck/should_fail/all.T21
-rwxr-xr-xtestsuite/tests/typecheck/should_run/all.T6
20 files changed, 43 insertions, 67 deletions
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 0574d01dc5..0dca7ad213 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -114,10 +114,7 @@ test('T8103', only_ways(['normal']), compile_and_run, [''])
test('T7953', reqlib('random'), compile_and_run, [''])
test('T8256', normal, compile_and_run, ['-dcore-lint -O1'])
test('T6084',normal, compile_and_run, ['-O2'])
-test('CgStaticPointers',
- [ when(compiler_lt('ghc', '7.9'), skip)
- , when(doing_ghci(), extra_hc_opts('-fobject-code'))
- ],
+test('CgStaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
test('StaticArraySize', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, ['-O2'])
@@ -142,4 +139,4 @@ test('T10521', normal, compile_and_run, [''])
test('T10521b', normal, compile_and_run, [''])
test('T10870', normal, compile_and_run, [''])
test('PopCnt', omit_ways(['ghci']), multi_compile_and_run,
- ['PopCnt', [('PopCnt_cmm.cmm', '')], '']) \ No newline at end of file
+ ['PopCnt', [('PopCnt_cmm.cmm', '')], ''])
diff --git a/testsuite/tests/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index 9f50ea6c72..6bd054286b 100644
--- a/testsuite/tests/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
@@ -38,12 +38,9 @@ test('mc06', normal, compile_and_run, [''])
test('mc07', normal, compile_and_run, [''])
test('mc08', normal, compile_and_run, [''])
test('T5742', normal, compile_and_run, [''])
-test('DsLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])
-test('DsMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])
-test('DsStaticPointers',
- [ when(compiler_lt('ghc', '7.9'), skip)
- , when(doing_ghci(), extra_hc_opts('-fobject-code'))
- ],
+test('DsLambdaCase', [], compile_and_run, [''])
+test('DsMultiWayIf', [], compile_and_run, [''])
+test('DsStaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
test('T8952', normal, compile_and_run, [''])
test('T9238', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-api/show-srcspan/all.T b/testsuite/tests/ghc-api/show-srcspan/all.T
index fbb8d04cde..100b3f03ea 100644
--- a/testsuite/tests/ghc-api/show-srcspan/all.T
+++ b/testsuite/tests/ghc-api/show-srcspan/all.T
@@ -1 +1 @@
-test('showsrcspan', normal, run_command, ['$MAKE -s --no-print-directory showsrcspan']) \ No newline at end of file
+test('showsrcspan', normal, run_command, ['$MAKE -s --no-print-directory showsrcspan'])
diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T
index 28089a2727..359f0f981d 100644
--- a/testsuite/tests/ghci.debugger/scripts/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/all.T
@@ -37,7 +37,7 @@ test('print034', normal, ghci_script, ['print034.script'])
test('print035',
[extra_clean(['../Unboxed.hi', '../Unboxed.o'])],
ghci_script, ['print035.script'])
-test('print036', when(compiler_ge('ghc','7.8'), expect_broken(9046)), ghci_script, ['print036.script'])
+test('print036', expect_broken(9046), ghci_script, ['print036.script'])
test('break001', normal, ghci_script, ['break001.script'])
test('break002', normal, ghci_script, ['break002.script'])
diff --git a/testsuite/tests/ghci/should_fail/all.T b/testsuite/tests/ghci/should_fail/all.T
index 024322bfd1..58a396ed86 100644
--- a/testsuite/tests/ghci/should_fail/all.T
+++ b/testsuite/tests/ghci/should_fail/all.T
@@ -1,2 +1,2 @@
test('T10549', [], ghci_script, ['T10549.script'])
-test('T10549a', [], ghci_script, ['T10549a.script']) \ No newline at end of file
+test('T10549a', [], ghci_script, ['T10549a.script'])
diff --git a/testsuite/tests/indexed-types/should_run/all.T b/testsuite/tests/indexed-types/should_run/all.T
index 8d72c4693c..15971eb566 100644
--- a/testsuite/tests/indexed-types/should_run/all.T
+++ b/testsuite/tests/indexed-types/should_run/all.T
@@ -6,4 +6,4 @@ test('T4235', normal, compile_and_run, [''])
test('GMapAssoc', normal, compile_and_run, ['-package containers'])
test('GMapTop', normal, compile_and_run, ['-package containers'])
test('T5719', normal, compile_and_run, [''])
-test('T11465a', normal, compile_and_run, ['']) \ No newline at end of file
+test('T11465a', normal, compile_and_run, [''])
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 6865e70c54..111f1ed965 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -90,13 +90,13 @@ test('NondecreasingIndentation', normal, compile, [''])
test('mc15', normal, compile, [''])
test('mc16', normal, compile, [''])
test('EmptyDecls', normal, compile, [''])
-test('ParserLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile, [''])
+test('ParserLambdaCase', [], compile, [''])
test('T5243', extra_clean(['T5243A.hi', 'T5243A.o']),
multimod_compile, ['T5243',''])
test('T7118', normal, compile, [''])
test('T7776', normal, compile, [''])
-test('RdrNoStaticPointers01', when(compiler_lt('ghc', '7.9'), skip), compile, [''])
+test('RdrNoStaticPointers01', [], compile, [''])
test('T5682', normal, compile, [''])
test('T9723a', normal, compile, [''])
test('T9723b', normal, compile, [''])
diff --git a/testsuite/tests/parser/should_fail/all.T b/testsuite/tests/parser/should_fail/all.T
index 66945dd479..21b523ad24 100644
--- a/testsuite/tests/parser/should_fail/all.T
+++ b/testsuite/tests/parser/should_fail/all.T
@@ -74,8 +74,8 @@ test('readFailTraditionalRecords1', normal, compile_fail, [''])
test('readFailTraditionalRecords2', normal, compile_fail, [''])
test('readFailTraditionalRecords3', normal, compile_fail, [''])
test('ParserNoForallUnicode', normal, compile_fail, [''])
-test('ParserNoLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile_fail, [''])
-test('ParserNoMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_fail, [''])
+test('ParserNoLambdaCase', [], compile_fail, [''])
+test('ParserNoMultiWayIf', [], compile_fail, [''])
test('ParserNoBinaryLiterals1', normal, compile_fail, [''])
test('ParserNoBinaryLiterals2', normal, compile_fail, [''])
test('ParserNoBinaryLiterals3', normal, compile_fail, [''])
diff --git a/testsuite/tests/parser/should_run/all.T b/testsuite/tests/parser/should_run/all.T
index cf7ee6fdd3..8a72c421ab 100644
--- a/testsuite/tests/parser/should_run/all.T
+++ b/testsuite/tests/parser/should_run/all.T
@@ -5,7 +5,7 @@ test('readRun004', normal, compile_and_run, ['-fobject-code'])
test('T1344', normal, compile_and_run, [''])
test('operator', normal, compile_and_run, [''])
test('operator2', normal, compile_and_run, [''])
-test('ParserMultiWayIf', when(compiler_lt('ghc', '7.5'), skip), compile_and_run, [''])
+test('ParserMultiWayIf', [], compile_and_run, [''])
test('BinaryLiterals0', normal, compile_and_run, [''])
-test('BinaryLiterals1', when(compiler_lt('ghc', '7.9'), skip), compile_and_run, [''])
-test('BinaryLiterals2', when(compiler_lt('ghc', '7.9'), skip), compile_and_run, ['']) \ No newline at end of file
+test('BinaryLiterals1', [], compile_and_run, [''])
+test('BinaryLiterals2', [], compile_and_run, [''])
diff --git a/testsuite/tests/partial-sigs/should_fail/all.T b/testsuite/tests/partial-sigs/should_fail/all.T
index 649079e6c6..c62dd9c769 100644
--- a/testsuite/tests/partial-sigs/should_fail/all.T
+++ b/testsuite/tests/partial-sigs/should_fail/all.T
@@ -59,4 +59,4 @@ test('WildcardInTypeSynonymRHS', normal, compile_fail, [''])
test('T10615', normal, compile_fail, [''])
test('T10045', normal, compile_fail, [''])
test('T10999', normal, compile_fail, [''])
-test('T11122', normal, compile, ['']) \ No newline at end of file
+test('T11122', normal, compile, [''])
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 7bbbe1c4cd..189e519fed 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -3,7 +3,6 @@ def f(name, opts):
opts.skip = 1
setTestOpts(f)
-setTestOpts(when(compiler_lt('ghc', '7.1'), skip))
test('plugins01',
[pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01'),
diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index 689109e9a6..94d351e07a 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -58,4 +58,4 @@ test('pmc006', [], compile,
test('pmc007', [], compile,
['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
test('T11245', [], compile,
- ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) \ No newline at end of file
+ ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
diff --git a/testsuite/tests/rebindable/all.T b/testsuite/tests/rebindable/all.T
index 3ca873e284..b42f884055 100644
--- a/testsuite/tests/rebindable/all.T
+++ b/testsuite/tests/rebindable/all.T
@@ -31,4 +31,4 @@ test('T4851', normal, compile, [''])
test('T5908', normal, compile, [''])
test('T10112', normal, compile, [''])
-test('T11216', [expect_broken(11216)], compile, ['']) \ No newline at end of file
+test('T11216', [expect_broken(11216)], compile, [''])
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 82d341b6ae..ebe67976aa 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -113,12 +113,9 @@ test('T7937', normal, compile_fail, [''])
test('T7943', normal, compile_fail, [''])
test('T8448', normal, compile_fail, [''])
test('T8149', normal, compile, [''])
-test('RnStaticPointersFail01',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
-test('RnStaticPointersFail02',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
-test('RnStaticPointersFail03',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
+test('RnStaticPointersFail01', [], compile_fail, [''])
+test('RnStaticPointersFail02', [], compile_fail, [''])
+test('RnStaticPointersFail03', [], compile_fail, [''])
test('T9006',
extra_clean(['T9006a.hi', 'T9006a.o']),
multimod_compile_fail, ['T9006', '-v0'])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 5aa296a3b9..3a09c51527 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -266,15 +266,9 @@ test('rdynamic', [ unless(opsys('linux') or opsys('mingw32'), skip)
],
compile_and_run, ['-rdynamic -package ghc'])
-test('GcStaticPointers',
- [ when(compiler_lt('ghc', '7.9'), skip)
- , when(doing_ghci(), extra_hc_opts('-fobject-code'))
- ],
+test('GcStaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
-test('ListStaticPointers',
- [ when(compiler_lt('ghc', '7.9'), skip)
- , when(doing_ghci(), extra_hc_opts('-fobject-code'))
- ],
+test('ListStaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
# 251 = RTS exit code for "out of memory"
diff --git a/testsuite/tests/simplCore/should_fail/all.T b/testsuite/tests/simplCore/should_fail/all.T
index 8e9e45ad73..2af98875d9 100644
--- a/testsuite/tests/simplCore/should_fail/all.T
+++ b/testsuite/tests/simplCore/should_fail/all.T
@@ -1,3 +1,3 @@
test('T7411', [expect_broken_for(7411, ['optasm', 'optllvm',
'hpc', 'threaded2', 'dyn']),
- exit_code(1)], compile_and_run, ['']) \ No newline at end of file
+ exit_code(1)], compile_and_run, [''])
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index c0c975fd5c..5b72ba0faa 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -316,14 +316,9 @@ test('T8577',
multimod_compile_fail,
['T8577', '-v0 ' + config.ghc_th_way_flags])
test('T8625', normal, ghci_script, ['T8625.script'])
-test('TH_StaticPointers',
- [ when(compiler_lt('ghc', '7.9'), skip)
- , when(doing_ghci(), extra_hc_opts('-fobject-code'))
- ],
+test('TH_StaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
-test('TH_StaticPointers02',
- [ when(compiler_lt('ghc', '7.9'), skip) ],
- compile_fail, [''])
+test('TH_StaticPointers02', [], compile_fail, [''])
test('T8759', normal, compile_fail, ['-v0'])
test('T7021',
extra_clean(['T7021a.hi', 'T7021a.o']), multimod_compile,
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index f7c56449c1..2ee7f138e3 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -390,7 +390,7 @@ test('T6134', normal, compile, [''])
test('T6018', extra_clean(['T6018.hi' , 'T6018.o'
,'T6018A.hi', 'T6018A.o'])
, multimod_compile, ['T6018', ''])
-test('TcLambdaCase', when(compiler_lt('ghc', '7.5'), skip), compile, [''])
+test('TcLambdaCase', [], compile, [''])
test('T7147', normal, compile, [''])
test('T7171',normal,run_command,
['$MAKE -s --no-print-directory T7171'])
@@ -415,14 +415,14 @@ test('T7888', normal, compile, [''])
test('T7891', normal, compile, [''])
test('T7903', normal, compile, [''])
test('TcTypeNatSimple', normal, compile, [''])
-test('TcCoercibleCompile', when(compiler_lt('ghc', '7.7'), skip), compile, [''])
+test('TcCoercibleCompile', [], compile, [''])
test('T8392', normal, compile, [''])
test('T8474', normal, compile, [''])
test('T8563', normal, compile, [''])
test('T8565', normal, compile, [''])
test('T8644', normal, compile, [''])
-test('TcStaticPointers01', when(compiler_lt('ghc', '7.9'), skip), compile, [''])
-test('TcStaticPointers02', when(compiler_lt('ghc', '7.9'), skip), compile, [''])
+test('TcStaticPointers01', [], compile, [''])
+test('TcStaticPointers02', [], compile, [''])
test('T8762', normal, compile, [''])
test('MutRec', normal, compile, [''])
test('T8856', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 24ce95c68d..df71bf7086 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -292,7 +292,7 @@ test('FDsFromGivens2', normal, compile_fail, [''])
test('T7019', normal, compile_fail,[''])
test('T7019a', normal, compile_fail,[''])
test('T5978', normal, compile_fail, [''])
-test('TcMultiWayIfFail', when(compiler_lt('ghc', '7.5'), skip), compile_fail, [''])
+test('TcMultiWayIfFail', [], compile_fail, [''])
test('T2534', normal, compile_fail, [''])
test('T7175', normal, compile_fail, [''])
test('T7210', normal, compile_fail, [''])
@@ -314,8 +314,8 @@ test('T7734', normal, compile_fail, [''])
test('T7697', normal, compile_fail, [''])
test('T7696', normal, compile_fail, [''])
test('T7748a', normal, compile_fail, [''])
-test('TcNoNullaryTC', when(compiler_lt('ghc', '7.7'), skip), compile_fail, [''])
-test('TcNullaryTCFail', when(compiler_lt('ghc', '7.7'), skip), compile_fail, [''])
+test('TcNoNullaryTC', [], compile_fail, [''])
+test('TcNullaryTCFail', [], compile_fail, [''])
test('T7857', normal, compile_fail, [''])
test('T7778', normal, compile_fail, [''])
test('T7851', normal, compile_fail, [''])
@@ -327,9 +327,9 @@ test('T7989', normal, compile_fail, [''])
test('T8034', normal, compile_fail, [''])
test('T8142', normal, compile_fail, [''])
test('T8262', normal, compile_fail, [''])
-test('TcCoercibleFail', when(compiler_lt('ghc', '7.7'), skip), compile_fail, [''])
-test('TcCoercibleFail2', when(compiler_lt('ghc', '7.7'), skip), compile_fail, [''])
-test('TcCoercibleFail3', when(compiler_lt('ghc', '7.7'), skip), compile_fail, [''])
+test('TcCoercibleFail', [], compile_fail, [''])
+test('TcCoercibleFail2', [], compile_fail, [''])
+test('TcCoercibleFail3', [], compile_fail, [''])
test('T8306', normal, compile_fail, [''])
test('T8392a', normal, compile_fail, [''])
test('T8428', normal, compile_fail, [''])
@@ -340,12 +340,9 @@ test('ContextStack2', normal, compile_fail, ['-freduction-depth=10'])
test('T8570', extra_clean(['T85570a.o', 'T8570a.hi','T85570b.o', 'T8570b.hi']),
multimod_compile_fail, ['T8570', '-v0'])
test('T8603', normal, compile_fail, [''])
-test('TcStaticPointersFail01',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
-test('TcStaticPointersFail02',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
-test('TcStaticPointersFail03',
- when(compiler_lt('ghc', '7.9'), skip), compile_fail, [''])
+test('TcStaticPointersFail01', [], compile_fail, [''])
+test('TcStaticPointersFail02', [], compile_fail, [''])
+test('TcStaticPointersFail03', [], compile_fail, [''])
test('T8806', normal, compile_fail, [''])
test('T8912', normal, compile_fail, [''])
test('T9033', normal, compile_fail, [''])
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index a9f973f9ff..ca3753d51b 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -12,8 +12,8 @@ test('tcrun003', normal, compile_and_run, [''])
test('tcrun004', normal, compile_and_run, [''])
test('tcrun005', normal, compile_and_run, [''])
test('Defer01', normal, compile_and_run, [''])
-test('TcNullaryTC', when(compiler_lt('ghc', '7.7'), skip), compile_and_run, [''])
-test('TcCoercible', when(compiler_lt('ghc', '7.7'), skip), compile_and_run, [''])
+test('TcNullaryTC', [], compile_and_run, [''])
+test('TcCoercible', [], compile_and_run, [''])
# -----------------------------------------------------------------------------
# Skip everything else if fast is on
@@ -115,4 +115,4 @@ test('T11049', exit_code(1), compile_and_run, [''])
test('T11230', normal, compile_and_run, [''])
test('TypeOf', normal, compile_and_run, [''])
test('T11120', normal, compile_and_run, [''])
-test('KindInvariant', normal, ghci_script, ['KindInvariant.script']) \ No newline at end of file
+test('KindInvariant', normal, ghci_script, ['KindInvariant.script'])