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.

containers @ aa982fb8

-Subproject commit d08e47bf6895da8c8b5a7dd62496a2f4fe73631e
+Subproject commit aa982fb83f2561d3b27b89b46d36ffca21e072cc

hpc @ 63adbd0c

-Subproject commit 6bfeb4c73ef44d2074f6edb314b9735bb57b8ef1
+Subproject commit 63adbd0ca8be391358c0313a94d5c1801ceafb55

stm @ ee756000

-Subproject commit a92741a64796eace06bc3c86467a0d036acf6eb9
+Subproject commit ee756000fc654a105ff3f8a319b904f2df33c65b

testsuite/driver/testlib.py

@@ -366,22 +366,6 @@ def have_profiling( ):
 def in_tree_compiler( ):
     return config.in_tree_compiler
 
-def compiler_lt( compiler, version ):
-    assert compiler == 'ghc'
-    return version_lt(config.compiler_version, version)
-
-def compiler_le( compiler, version ):
-    assert compiler == 'ghc'
-    return version_le(config.compiler_version, version)
-
-def compiler_gt( compiler, version ):
-    assert compiler == 'ghc'
-    return version_gt(config.compiler_version, version)
-
-def compiler_ge( compiler, version ):
-    assert compiler == 'ghc'
-    return version_ge(config.compiler_version, version)
-
 def unregisterised( ):
     return config.unregisterised
 
@@ -2149,10 +2133,6 @@ def qualify( name, suff ):
 #
 #   <test>.stdout[-ws-<wordsize>][-<platform>]
 #
-# and we pick the most specific version available.  The <version> is
-# the major version of the compiler (e.g. 6.8.2 would be "6.8").  For
-# more fine-grained control use compiler_lt().
-#
 def find_expected_file(name, suff):
     basename = add_suffix(name, suff)
     basepath = in_testdir(basename)

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', '')], ''])

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, [''])

testsuite/tests/ghc-api/show-srcspan/all.T

-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'])

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'])

testsuite/tests/ghci/should_fail/all.T

 test('T10549', [], ghci_script, ['T10549.script'])
-test('T10549a', [], ghci_script, ['T10549a.script'])
\ No newline at end of file
+test('T10549a', [], ghci_script, ['T10549a.script'])

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, [''])

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, [''])

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, [''])

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, [''])

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, [''])

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'),

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'])

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, [''])

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'])

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"

testsuite/tests/simplCore/should_fail/all.T

 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, [''])

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,

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, [''])

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, [''])

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'])