Skip to content
Snippets Groups Projects
Unverified Commit 14f1b614 authored by Matthew Pickering's avatar Matthew Pickering Committed by Zubin
Browse files

hadrian: Install windows bindist by copying in test_hadrian

(cherry picked from commit 22a16b0f)
parent 23966d10
No related branches found
No related tags found
No related merge requests found
...@@ -364,14 +364,23 @@ function build_hadrian() { ...@@ -364,14 +364,23 @@ function build_hadrian() {
function test_hadrian() { function test_hadrian() {
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:-}"
} }
function clean() { function clean() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment