From 00f8e68ebe6ebd15197674df53c44c1e3558ff97 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 16 Jun 2022 20:34:47 -0400 Subject: testsuite: Use normalise_version more consistently Previously several tests' output were unnecessarily dependent on version numbers, particularly of `base`. Fix this. --- testsuite/tests/dependent/should_compile/all.T | 6 +++--- testsuite/tests/indexed-types/should_compile/all.T | 4 ++-- testsuite/tests/package/all.T | 2 +- testsuite/tests/polykinds/all.T | 4 ++-- testsuite/tests/printer/all.T | 2 +- testsuite/tests/th/all.T | 2 +- testsuite/tests/typecheck/should_compile/all.T | 10 +++++----- testsuite/tests/typecheck/should_fail/all.T | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/testsuite/tests/dependent/should_compile/all.T b/testsuite/tests/dependent/should_compile/all.T index 93d9164768..77dcb580df 100644 --- a/testsuite/tests/dependent/should_compile/all.T +++ b/testsuite/tests/dependent/should_compile/all.T @@ -58,12 +58,12 @@ test('T15419', normal, compile, ['']) test('T14066h', normal, compile, ['']) test('T15666', normal, compile, ['']) test('T15725', normal, compile, ['']) -test('T15743', normal, compile, ['-ddump-types -fprint-explicit-foralls']) +test('T15743', normalise_version('base'), compile, ['-ddump-types -fprint-explicit-foralls']) test('InferDependency', normal, compile, ['']) -test('T15743e', normal, compile, ['-ddump-types -fprint-explicit-foralls']) +test('T15743e', normalise_version('base'), compile, ['-ddump-types -fprint-explicit-foralls']) test('T15076c', normal, compile, ['']) test('T15829', normal, compile, ['']) -test('T14729', normal, compile, ['-ddump-types -fprint-typechecker-elaboration -fprint-explicit-coercions']) +test('T14729', normalise_version('base'), compile, ['-ddump-types -fprint-typechecker-elaboration -fprint-explicit-coercions']) test('T14729kind', normal, ghci_script, ['T14729kind.script']) test('T16326_Compile1', normal, compile, ['']) test('T16326_Compile2', normal, compile, ['']) diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T index 3549a37f70..7ebb9eae80 100644 --- a/testsuite/tests/indexed-types/should_compile/all.T +++ b/testsuite/tests/indexed-types/should_compile/all.T @@ -280,8 +280,8 @@ test('T15352', normal, compile, ['']) test('T15664', normal, compile, ['']) test('T15943', normal, compile, ['']) test('T15704', normal, compile, ['']) -test('T15711', normal, compile, ['-ddump-types']) -test('T15852', normal, compile, ['-ddump-types']) +test('T15711', normalise_version('base'), compile, ['-ddump-types']) +test('T15852', normalise_version('base'), compile, ['-ddump-types']) test('T15764a', normal, compile, ['']) test('T15740a', normal, compile, ['']) test('T16110_Compile', normal, compile, ['']) diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T index ab84cc99f8..e5d7151b67 100644 --- a/testsuite/tests/package/all.T +++ b/testsuite/tests/package/all.T @@ -19,4 +19,4 @@ test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, test('package10', normal, compile, ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" ']) test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers']) -test('T4806a', normalise_version('containers'), compile_fail, ['-ignore-package deepseq']) +test('T4806a', normalise_version('deepseq', 'containers'), compile_fail, ['-ignore-package deepseq']) diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T index 459ba1350d..e649651460 100644 --- a/testsuite/tests/polykinds/all.T +++ b/testsuite/tests/polykinds/all.T @@ -192,8 +192,8 @@ test('T15116a', normal, compile_fail, ['']) test('T15170', normal, compile, ['']) test('T14939', normal, compile, ['-O']) test('T15577', normal, compile_fail, ['-O']) -test('T15592', normal, compile, ['']) -test('T15592b', normal, compile, ['-ddump-types -fprint-explicit-foralls']) +test('T15592', normalise_version('base'), compile, ['']) +test('T15592b', normalise_version('base'), compile, ['-ddump-types -fprint-explicit-foralls']) test('T15787', normal, compile_fail, ['']) test('T15789', normal, compile_fail, ['']) test('T15804', normal, compile_fail, ['']) diff --git a/testsuite/tests/printer/all.T b/testsuite/tests/printer/all.T index 7852a8adbe..8a7b1533cd 100644 --- a/testsuite/tests/printer/all.T +++ b/testsuite/tests/printer/all.T @@ -71,7 +71,7 @@ test('T14343', normal, compile_fail, ['']) test('T14343b', normal, compile_fail, ['']) test('T15761', normal, compile_fail, ['']) test('T17697', normal, compile, ['']) -test('T18052a', normal, compile, +test('T18052a', normalise_version('base'), compile, ['-ddump-simpl -ddump-types -dno-typeable-binds -dsuppress-uniques']) test('T18791', normal, compile, ['-ddump-parsed-ast']) test('RdrNames', [ignore_stderr, req_ppr_deps], makefile_test, ['RdrNames']) diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T index 7147fa4182..9b606a70e4 100644 --- a/testsuite/tests/th/all.T +++ b/testsuite/tests/th/all.T @@ -543,7 +543,7 @@ test('T17820c', normal, compile_fail, ['']) test('T17820d', normal, compile_fail, ['']) test('T17820e', normal, compile_fail, ['']) test('T20454', normal, compile_and_run, ['']) -test('T21547', [extra_files(['T21547A.hs'])], multimod_compile_fail, ['T21547', '-v0']) +test('T21547', [extra_files(['T21547A.hs']), normalise_version('base')], multimod_compile_fail, ['T21547', '-v0']) test('T20590', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques']) test('T20773', only_ways(['ghci']), ghci_script, ['T20773.script']) test('T20884', normal, compile_fail, ['']) diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T index a258f6de03..62edaf99e6 100644 --- a/testsuite/tests/typecheck/should_compile/all.T +++ b/testsuite/tests/typecheck/should_compile/all.T @@ -389,7 +389,7 @@ test('hole_constraints_nested', normal, compile, ['-fdefer-type-errors -fno-max- test('valid_hole_fits', extra_files(['ValidHoleFits.hs']), multimod_compile, ['valid_hole_fits','-fdefer-type-errors -fno-max-valid-hole-fits']) test('local_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits']) -test('subsumption_sort_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fsort-by-subsumption-hole-fits']) +test('subsumption_sort_hole_fits', normalise_version('base'), compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fsort-by-subsumption-hole-fits']) test('valid_hole_fits_interactions', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits']) test('refinement_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fno-max-refinement-hole-fits -frefinement-level-hole-fits=2']) test('abstract_refinement_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fno-max-refinement-hole-fits -frefinement-level-hole-fits=2 -fabstract-refinement-hole-fits -funclutter-valid-hole-fits']) @@ -544,7 +544,7 @@ test('T12427b', normal, compile, ['']) test('T12507', normal, compile, ['']) test('T12734', normal, compile, ['']) test('T12734a', normal, compile_fail, ['']) -test('T12763', normal, compile, ['']) +test('T12763', normalise_version('base'), compile, ['']) test('T12785a', normal, compile, ['']) test('T12797', normal, compile, ['']) test('T12850', normal, compile, ['']) @@ -823,9 +823,9 @@ test('T21010', [extra_files(['T21010A.hs', 'T21010B.hs'])], multimod_compile, [' test('FunDepOrigin1', normal, compile, ['']) test('FloatFDs', normal, compile, ['']) test('ImplicitParamFDs', normal, compile, ['']) -test('T18406b', normal, compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques -fprint-typechecker-elaboration']) -test('T18529', normal, compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques -fprint-typechecker-elaboration']) -test('T21023', normal, compile, ['-ddump-types']) +test('T18406b', normalise_version('base'), compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques -fprint-typechecker-elaboration']) +test('T18529', normalise_version('base'), compile, ['-ddump-tc -fprint-explicit-foralls -dsuppress-uniques -fprint-typechecker-elaboration']) +test('T21023', normalise_version('base'), compile, ['-ddump-types']) test('T21205', normal, compile, ['-O0']) test('T21323', normal, compile, ['']) test('T21315', normal, compile, ['-Wredundant-constraints']) diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T index 46fecd51ce..457e0c5bc1 100644 --- a/testsuite/tests/typecheck/should_fail/all.T +++ b/testsuite/tests/typecheck/should_fail/all.T @@ -205,7 +205,7 @@ test('T3155', normal, compile_fail, ['']) test('T3176', normal, compile_fail, ['']) test('T1633', normal, compile_fail, ['']) test('T2806', normal, compile, ['']) -test('T3323', normal, compile_fail, ['']) +test('T3323', normalise_version('base'), compile_fail, ['']) test('T3406', normal, compile_fail, ['']) test('T3540', normal, compile_fail, ['']) test('T3102', normal, compile, ['']) -- cgit v1.2.1