diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-16 10:43:11 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-17 01:03:11 -0400 |
| commit | b15a7fb8aa022bfdf3286d65227061c19a4acf28 (patch) | |
| tree | 95e8f4dcf22302e6ed14ab8a98eabd6ea41505af /testsuite/tests/stranal | |
| parent | 42ebc3f67c8def0f941792b51bd27270ec8e8d88 (diff) | |
| download | haskell-b15a7fb8aa022bfdf3286d65227061c19a4acf28.tar.gz | |
testsuite: Ensure that makefile tests get run
Previously `makefile_test` and `run_command` tests could easily end up
in a situation where they wouldn't be run if the user used the
`only_ways` modifier. The reason is to build the set of a ways to run
the test in we first start with a candidate set determined by the test
type (e.g. `makefile_test`, `compile_run`, etc.) and then filter that
set with the constraints given by the test's modifiers.
`makefile_test` and `run_command` tests' candidate sets were simply
`{normal}`, and consequently most uses of `only_ways` would result in
the test being never run.
To avoid this we rather use all ways as the candidate sets for these
test types. This may result in a few more testcases than we would like
(given that some `run_command` tests are insensitive to way) but this
can be fixed by adding modifiers and we would much rather run too many
tests than too few.
This fixes #16042 and a number of other tests afflicted by the same issue.
However, there were a few cases that required special attention:
* `T14028` is currently failing and is therefore marked as broken due
to #17300
* `T-signals-child` is fragile in the `threaded1` and `threaded2` ways
(tracked in #17307)
Diffstat (limited to 'testsuite/tests/stranal')
| -rw-r--r-- | testsuite/tests/stranal/should_compile/T13031.stdout | 4 | ||||
| -rw-r--r-- | testsuite/tests/stranal/should_compile/T16029.stdout | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/testsuite/tests/stranal/should_compile/T13031.stdout b/testsuite/tests/stranal/should_compile/T13031.stdout index b6b9f61458..22ef963cea 100644 --- a/testsuite/tests/stranal/should_compile/T13031.stdout +++ b/testsuite/tests/stranal/should_compile/T13031.stdout @@ -1,4 +1,2 @@ -echo hello hello -'/5playpen/simonpj/HEAD-4/inplace/test spaces/ghc-stage2' -dcore-lint -dcmm-lint -no-user-package-db -rtsopts -fno-warn-missed-specialisations -fshow-warning-groups -fdiagnostics-color=never -dno-debug-output -c -fforce-recomp T13031.hs -ddump-simpl | grep 'Arity=' -[GblId, Arity=1, Caf=NoCafRefs] +[GblId, Arity=1, Caf=NoCafRefs, Unf=OtherCon []] diff --git a/testsuite/tests/stranal/should_compile/T16029.stdout b/testsuite/tests/stranal/should_compile/T16029.stdout index c06ac7c8b3..5aae1ff281 100644 --- a/testsuite/tests/stranal/should_compile/T16029.stdout +++ b/testsuite/tests/stranal/should_compile/T16029.stdout @@ -1,4 +1,4 @@ -T16029.$WMkT [InlPrag=INLINE[2]] :: Int -> Int -> T +T16029.$WMkT [InlPrag=INLINE[0]] :: Int -> Int -> T Tmpl= \ (dt [Occ=Once!] :: Int) (dt [Occ=Once!] :: Int) -> = \ (dt [Occ=Once!] :: Int) (dt [Occ=Once!] :: Int) -> :: GHC.Prim.Int# -> GHC.Prim.Int# |