diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-07 15:39:43 +0100 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-08-04 18:25:26 +0530 |
| commit | 14f1b6143301a1828480b83a9c323994bfa34750 (patch) | |
| tree | 75f323c21fb15f0296a28d53ade6ae6ce929af14 | |
| parent | 23966d10cf3f043aa643320434cd490f435037bb (diff) | |
| download | haskell-14f1b6143301a1828480b83a9c323994bfa34750.tar.gz | |
hadrian: Install windows bindist by copying in test_hadrian
(cherry picked from commit 22a16b0fc0b1d6a257027cfc1881e94ae188a1cd)
| -rwxr-xr-x | .gitlab/ci.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 2b071186cf..6add2b5ae4 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -364,14 +364,23 @@ function build_hadrian() { function test_hadrian() { cd _build/bindist/ghc-*/ - run ./configure --prefix="$TOP"/_build/install - run "$MAKE" install + case "$(uname)" in + MSYS_*|MINGW*) + mkdir -p "$TOP"/_build/install + cp -a * "$TOP"/_build/install + ;; + *) + run ./configure --prefix="$TOP"/_build/install + run "$MAKE" install + ;; + esac cd ../../../ run_hadrian \ test \ --summary-junit=./junit.xml \ - --test-compiler="$TOP"/_build/install/bin/ghc + --test-compiler="$TOP/_build/install/bin/ghc$exe" \ + "runtest.opts+=${RUNTEST_ARGS:-}" } function clean() { |