diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2019-03-04 08:45:54 -0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-03-11 18:11:59 -0400 |
| commit | bcb6769c83744c211d3ddddbc7fd9dec88452c88 (patch) | |
| tree | d73f9ec1d1874cc433da0d8ecfb3fcdea2836b91 /testsuite/tests/safeHaskell/check | |
| parent | 0cd989577a8b8d2666741fcac4fd3032ae212b80 (diff) | |
| download | haskell-bcb6769c83744c211d3ddddbc7fd9dec88452c88.tar.gz | |
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 8f19ecc95fbaf2cc977531d721085d8441dc09b7.
Diffstat (limited to 'testsuite/tests/safeHaskell/check')
| -rw-r--r-- | testsuite/tests/safeHaskell/check/all.T | 1 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/all.T | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/tests/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T index a4ac4b46cd..47e875d3be 100644 --- a/testsuite/tests/safeHaskell/check/all.T +++ b/testsuite/tests/safeHaskell/check/all.T @@ -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']) diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T index 2b3d21a043..d4a63b5d7d 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/all.T +++ b/testsuite/tests/safeHaskell/check/pkg01/all.T @@ -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']), |