Commit 64433428 authored by Alp Mestanogullari's avatar Alp Mestanogullari 🦑 Committed by Ben Gamari
Browse files

hadrian: export METRICS_FILE to make it accessible to perf notes script

This addresses #17456 and also fixes the --metrics-file argument that Hadrian
passes to the testsuite driver.
parent 049d9ae0
...@@ -204,13 +204,13 @@ lint-release-changelogs: ...@@ -204,13 +204,13 @@ lint-release-changelogs:
- cd _build/bindist/ghc-*/ && ./configure --prefix=$TOP/_build/install && make install && cd ../../../ - cd _build/bindist/ghc-*/ && ./configure --prefix=$TOP/_build/install && make install && cd ../../../
- | - |
# Prepare to push git notes. # Prepare to push git notes.
METRICS_FILE=$CI_PROJECT_DIR/performance-metrics.tsv export METRICS_FILE=$CI_PROJECT_DIR/performance-metrics.tsv
git config user.email "ben+ghc-ci@smart-cactus.org" git config user.email "ben+ghc-ci@smart-cactus.org"
git config user.name "GHC GitLab CI" git config user.name "GHC GitLab CI"
- hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml --test-compiler=$TOP/_build/install/bin/ghc || (METRICS_FILE=$METRICS_FILE .gitlab/push-test-metrics.sh && false) - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml --test-compiler=$TOP/_build/install/bin/ghc || (.gitlab/push-test-metrics.sh && false)
- | - |
# Push git notes. # Push git notes.
METRICS_FILE=$METRICS_FILE .gitlab/push-test-metrics.sh .gitlab/push-test-metrics.sh
cache: cache:
key: hadrian key: hadrian
paths: paths:
......
...@@ -141,8 +141,7 @@ runTestBuilderArgs = builder RunTest ? do ...@@ -141,8 +141,7 @@ runTestBuilderArgs = builder RunTest ? do
, arg "--config", arg $ "stats_files_dir=" ++ statsFilesDir , arg "--config", arg $ "stats_files_dir=" ++ statsFilesDir
, arg $ "--threads=" ++ show threads , arg $ "--threads=" ++ show threads
, emitWhenSet testEnv $ \env -> arg ("--test-env=" ++ show env) , emitWhenSet testEnv $ \env -> arg ("--test-env=" ++ show env)
, emitWhenSet testMetricsFile $ \file -> mconcat , emitWhenSet testMetricsFile $ \file -> arg ("--metrics-file=" ++ file)
[ arg "--metrics-file", arg (show file) ]
, getTestArgs -- User-provided arguments from command line. , getTestArgs -- User-provided arguments from command line.
] ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment