From ab0f40f79874093e73b640df3d180b80c47b3f12 Mon Sep 17 00:00:00 2001 From: Cheng Shao <terrorjack@type.dance> Date: Sat, 1 Apr 2023 03:39:03 +0000 Subject: [PATCH] ci: update ci.sh to actually run the entire testsuite for wasm backend For the time being, we still need to use in-tree mode and can't test the bindist yet. (cherry picked from commit d5c4629b64cd30c5b443db3124f3b02283d122ca) --- .gitlab/ci.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 2d388f325d0..6d8a6f31c23 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -608,16 +608,17 @@ function test_hadrian() { if [[ "${CROSS_EMULATOR:-}" == "NOT_SET" ]]; then info "Cannot test cross-compiled build without CROSS_EMULATOR being set." return + elif [[ -n "${CROSS_TARGET:-}" ]] && [[ "${CROSS_TARGET:-}" == *"wasm"* ]]; then + run_hadrian \ + test \ + --summary-junit=./junit.xml \ + "runtest.opts+=${RUNTEST_ARGS:-}" || fail "hadrian main testsuite targetting $CROSS_TARGET" elif [ -n "${CROSS_TARGET:-}" ]; then local instdir="$TOP/_build/install" local test_compiler="$instdir/bin/${cross_prefix}ghc$exe" install_bindist _build/bindist/ghc-*/ "$instdir" echo 'main = putStrLn "hello world"' > expected run "$test_compiler" -package ghc "$TOP/.gitlab/hello.hs" -o hello - # Despite "-o hello", ghc may output something like hello.exe or - # hello.wasm depending on the backend. For the time being let's - # just move it to hello before proceeding to running it. - mv hello.wasm hello || true ${CROSS_EMULATOR:-} ./hello > actual run diff expected actual elif [[ -n "${REINSTALL_GHC:-}" ]]; then -- GitLab