diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-22 20:32:18 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-06-24 12:04:19 -0400 |
| commit | 4817183392a6268a485f8060734f9b661ff265cb (patch) | |
| tree | e695ec098b4a289e44a07e40e99f9715df4d7192 | |
| parent | d6ab9c60288369ec991826b158d751dd4cb3319e (diff) | |
| download | haskell-4817183392a6268a485f8060734f9b661ff265cb.tar.gz | |
CI: Fix the cabal_test job to compile the Distribution.Simple target
The "Cabal test" was previously testing the compilation of the very
advanced Setup.hs file. Now we compile the whole library, as the test
intended.
| -rwxr-xr-x | .gitlab/ci.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 6f6c3de4cc..8e629a7601 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -464,7 +464,7 @@ function cabal_test() { -hidir tmp -odir tmp -fforce-recomp \ -ddump-to-file -dumpdir "$OUT/dumps" -ddump-timings \ +RTS --machine-readable "-t$OUT/rts.log" -RTS \ - -package mtl -ilibraries/Cabal/Cabal libraries/Cabal/Cabal/Setup.hs \ + -ilibraries/Cabal/Cabal/src -XNoPolyKinds Distribution.Simple \ "$@" rm -Rf tmp end_section "Cabal test: $OUT" @@ -586,6 +586,7 @@ case $1 in exit $res ;; run_hadrian) shift; run_hadrian "$@" ;; perf_test) run_perf_test ;; + cabal_test) cabal_test ;; clean) clean ;; shell) shell "$@" ;; *) fail "unknown mode $1" ;; |