diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-22 22:04:28 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-06-24 12:04:19 -0400 |
| commit | 171413c6789dea02305c34c12407b815449d69be (patch) | |
| tree | e2d2d86875f63252bfad7d0bd41c5994c005999a | |
| parent | 4817183392a6268a485f8060734f9b661ff265cb (diff) | |
| download | haskell-171413c6789dea02305c34c12407b815449d69be.tar.gz | |
cabal_test: Make output more like head.hackage output
This helps with the import of the results into the performance database.
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 8e629a7601..5d898f31da 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -462,10 +462,10 @@ function cabal_test() { mkdir -p "$OUT" run "$HC" \ -hidir tmp -odir tmp -fforce-recomp \ - -ddump-to-file -dumpdir "$OUT/dumps" -ddump-timings \ + -dumpdir "$OUT/dumps" -ddump-timings \ +RTS --machine-readable "-t$OUT/rts.log" -RTS \ -ilibraries/Cabal/Cabal/src -XNoPolyKinds Distribution.Simple \ - "$@" + "$@" 2>&1 | tee $OUT/log rm -Rf tmp end_section "Cabal test: $OUT" } @@ -476,6 +476,8 @@ function run_perf_test() { fi mkdir -p out + git -C libraries/Cabal/ rev-parse HEAD > out/cabal_commit + $HC --print-project-git-commit-id > out/ghc_commit OUT=out/Cabal-O0 cabal_test -O0 OUT=out/Cabal-O1 cabal_test -O1 OUT=out/Cabal-O2 cabal_test -O2 |