Commit bcb6769c authored by Alec Theriault's avatar Alec Theriault Committed by Marge Bot

Ignore more version numbers in the testsuite

Prevents some tests from failing just due to mismatched version numbers.

These version numbers shouldn't cause tests to fail, especially since
we *expect* them to be regularly incremented. The motivation for this
particular set of changes came from the changes that came along with
the `base` version bump in 8f19ecc9.
parent 0cd98957
Pipeline #3369 passed with stages
in 285 minutes and 16 seconds
test('ado001', normal, compile_and_run, [''])
test('ado002', normal, compile_fail, [''])
test('ado003', normal, compile_fail, [''])
test('ado004', normal, compile, [''])
test('ado004', normalise_version('base','ghc-prim','integer-gmp'), compile, [''])
test('ado005', normal, compile_fail, [''])
test('ado006', normal, compile, [''])
test('ado007', normal, compile, [''])
......
......@@ -8,7 +8,7 @@ test('bkp11', normal, backpack_compile, [''])
test('bkp12', normal, backpack_compile, [''])
test('bkp14', normal, backpack_compile, [''])
test('bkp15', normal, backpack_compile, [''])
test('bkp16', normal, backpack_compile, [''])
test('bkp16', normalise_version('base'), backpack_compile, [''])
test('bkp17', normal, backpack_compile, [''])
test('bkp18', normal, backpack_compile, [''])
test('bkp19', normal, backpack_compile, [''])
......
......@@ -11,10 +11,10 @@ test('bkpfail12', normal, backpack_compile_fail, [''])
test('bkpfail13', normal, backpack_compile_fail, [''])
test('bkpfail14', normal, backpack_compile_fail, [''])
test('bkpfail15', normal, backpack_compile_fail, [''])
test('bkpfail16', normal, backpack_compile_fail, [''])
test('bkpfail17', normal, backpack_compile_fail, [''])
test('bkpfail16', normalise_version('base'), backpack_compile_fail, [''])
test('bkpfail17', normalise_version('base'), backpack_compile_fail, [''])
test('bkpfail18', normal, backpack_compile_fail, [''])
test('bkpfail19', normal, backpack_compile_fail, [''])
test('bkpfail19', normalise_version('base'), backpack_compile_fail, [''])
test('bkpfail20', normal, backpack_compile_fail, [''])
test('bkpfail21', normal, backpack_compile_fail, [''])
test('bkpfail22', normal, backpack_compile_fail, [''])
......
test('determ021',
[normalise_fun(normalise_errmsg), extra_files(['A.hs'])],
[normalise_fun(normalise_errmsg), normalise_version('base', 'ghc-prim'),
extra_files(['A.hs'])],
makefile_test, ['determ021'])
......@@ -259,7 +259,7 @@ test('T12955', normal, makefile_test, [])
test('T12971', ignore_stdout, makefile_test, [])
test('json', normal, compile_fail, ['-ddump-json'])
test('json2', normal, compile, ['-ddump-types -ddump-json'])
test('json2', normalise_version('base','ghc-prim'), compile, ['-ddump-types -ddump-json'])
test('T13604', [], makefile_test, [])
test('T13604a', [], makefile_test, [])
# omitting hpc and profasm because they affect the
......
......@@ -22,7 +22,8 @@ test('ghci006', [ combined_output,
unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ],
ghci_script, ['ghci006.script'])
test('ghci007', combined_output, ghci_script, ['ghci007.script'])
test('ghci008', combined_output, ghci_script, ['ghci008.script'])
test('ghci008', [ combined_output,
normalise_version('base') ], ghci_script, ['ghci008.script'])
test('ghci009', combined_output, ghci_script, ['ghci009.script'])
# Skip this test: deadlock cannot be detected now, because we wait for
......
......@@ -110,7 +110,7 @@ test('T2448', normal, compile, [''])
test('T2291', normal, compile, [''])
test('T2639', normal, compile, [''])
test('T2944', normal, compile, [''])
test('T3017', normal, compile, ['-ddump-types'])
test('T3017', normalise_version('base','ghc-prim'), compile, ['-ddump-types'])
test('TF_GADT', normal, compile, [''])
test('T2203b', normal, compile, [''])
test('T2767', normal, compile, [''])
......
setTestOpts(normalise_version('base','ghc-prim'))
test('ADT', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('AddAndOr1', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('AddAndOr2', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
......
......@@ -39,7 +39,7 @@ test('rnfail035', normal, compile_fail, [''])
test('rnfail039', normal, compile_fail, [''])
test('rnfail040', [extra_files(['Rnfail040_A.hs'])], multimod_compile_fail, ['rnfail040', '-v0'])
test('rnfail040', [extra_files(['Rnfail040_A.hs']), normalise_version('base')], multimod_compile_fail, ['rnfail040', '-v0'])
test('rnfail041', normal, compile_fail, [''])
test('rnfail042', normal, compile_fail, [''])
......
setTestOpts(normalise_version('base','ghc-prim'))
test('Roles1', only_ways('normal'), compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques'])
test('Roles2', only_ways('normal'), compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques'])
test('Roles3', only_ways('normal'), compile, ['-ddump-tc -dsuppress-uniques'])
......
......@@ -6,6 +6,7 @@ def f( name, opts ):
opts.only_ways = ['normal']
setTestOpts(f)
setTestOpts(normalise_version('base'))
test('CheckA', normal, compile, [''])
test('CheckB', [], multimod_compile, ['CheckB', '-trust base'])
......
......@@ -35,7 +35,7 @@ test('safePkg01',
run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args])
# Fail since we enable package trust
test('ImpSafe01', normal, compile_fail, ['-fpackage-trust -distrust base'])
test('ImpSafe01', normalise_version('base'), compile_fail, ['-fpackage-trust -distrust base'])
# Succeed since we don't enable package trust
test('ImpSafe02', normal, compile, ['-distrust base'])
......@@ -49,7 +49,7 @@ test('ImpSafe03',
], '-fpackage-trust' ])
# Fail same as ImpSafe01 but testing with -XTrustworthy now
test('ImpSafe04', normal, compile_fail, ['-fpackage-trust -distrust base'])
test('ImpSafe04', normalise_version('base'), compile_fail, ['-fpackage-trust -distrust base'])
test('ImpSafeOnly01',
[extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
......
......@@ -36,7 +36,7 @@ test('SafeFlags14', normal, compile_fail, [''])
test('SafeFlags15', normal, compile, [''])
test('SafeFlags16', normal, compile, [''])
test('SafeFlags17', normal, compile_fail, ['-distrust base'])
test('SafeFlags17', normalise_version('base'), compile_fail, ['-distrust base'])
test('SafeFlags18', normal, compile_fail, ['-trust base -Werror'])
test('SafeFlags19', normal, compile_fail, [''])
test('SafeFlags20', normal, compile, ['-trust base'])
......
......@@ -239,7 +239,7 @@ test('tc227', normal, compile, [''])
test('tc228', normal, compile, [''])
test('tc229', normal, compile, [''])
test('tc230', normal, compile, [''])
test('tc231', normal, compile, [''])
test('tc231', normalise_version('base','ghc-prim'), compile, [''])
test('tc232', normal, compile, [''])
test('tc233', normal, compile, [''])
test('tc234', normal, compile, [''])
......@@ -381,9 +381,9 @@ test('T7050', normal, compile, ['-O'])
test('T7312', normal, compile, [''])
test('T7384', normal, compile, [''])
test('T7451', normal, compile, [''])
test('holes', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('holes', normalise_version('base'), compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('holes2', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('holes3', normal, compile_fail, ['-fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('holes3', normalise_version('base'), compile_fail, ['-fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('hole_constraints', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('hole_constraints_nested', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('valid_hole_fits', [extra_files(['ValidHoleFits.hs'])],
......
......@@ -164,7 +164,7 @@ test('tcfail178', normal, compile_fail, [''])
test('tcfail179', normal, compile_fail, [''])
test('tcfail180', normal, compile_fail, [''])
test('tcfail181', normal, compile_fail, [''])
test('tcfail182', normal, compile_fail, [''])
test('tcfail182', normalise_version('base'), compile_fail, [''])
test('tcfail183', normal, compile_fail, [''])
test('tcfail184', normal, compile_fail, [''])
test('tcfail185', normal, compile_fail, [''])
......@@ -332,7 +332,7 @@ test('ContextStack2', normal, compile, [''])
test('T8570', [], multimod_compile_fail, ['T8570', '-v0'])
test('T8603', normal, compile_fail, [''])
test('TcStaticPointersFail01', [], compile_fail, [''])
test('TcStaticPointersFail02', [], compile_fail, [''])
test('TcStaticPointersFail02', normalise_version('base'), compile_fail, [''])
test('TcStaticPointersFail03', [], compile_fail, [''])
test('T8806', normal, compile_fail, [''])
test('T8912', normal, compile_fail, [''])
......
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