summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-06-22 22:04:28 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2021-06-23 08:23:31 +0100
commit15e231a5b53cb8ae109a00c18e021c004eab82d1 (patch)
tree63c0f065b84a9b67f981af7766feb6f69be639e9
parent9e98ce4d7d1d5e323def40445431c3128af94531 (diff)
downloadhaskell-wip/cabal-test.tar.gz
cabal_test: Make output more like head.hackage outputwip/cabal-test
This helps with the import of the results into the performance database.
-rwxr-xr-x.gitlab/ci.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 1ce5cc6191..f74b6e5443 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -480,10 +480,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"
}
@@ -494,6 +494,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