Skip to content
Snippets Groups Projects
Commit 22a16b0f authored by Matthew Pickering's avatar Matthew Pickering Committed by Marge Bot
Browse files

hadrian: Install windows bindist by copying in test_hadrian

parent 5412730e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 3 deletions
.gitlab/ci.sh
+ 12
− 3
View file @ 22a16b0f
...@@ -441,15 +441,24 @@ function test_hadrian() { ...@@ -441,15 +441,24 @@ function test_hadrian() {
return return
fi fi
cd _build/bindist/ghc-*/ cd _build/bindist/ghc-*/
run ./configure --prefix="$TOP"/_build/install case "$(uname)" in
run "$MAKE" install MSYS_*|MINGW*)
mkdir -p "$TOP"/_build/install
cp -a * "$TOP"/_build/install
;;
*)
run ./configure --prefix="$TOP"/_build/install
run "$MAKE" install
;;
esac
cd ../../../ cd ../../../
run_hadrian \ run_hadrian \
test \ test \
--summary-junit=./junit.xml \ --summary-junit=./junit.xml \
--test-compiler="$TOP"/_build/install/bin/ghc \ --test-compiler="$TOP/_build/install/bin/ghc$exe" \
"runtest.opts+=${RUNTEST_ARGS:-}" "runtest.opts+=${RUNTEST_ARGS:-}"
} }
......
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