diff options
author | Cheng Shao <terrorjack@type.dance> | 2023-04-01 03:39:03 +0000 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-04-27 16:00:35 -0400 |
commit | d5c4629b64cd30c5b443db3124f3b02283d122ca (patch) | |
tree | 4dbddc09e1abc7ef8500788f496e829b380e0093 | |
parent | 052e2bb629abc97b394b9de2394eb36cbed9385f (diff) | |
download | haskell-d5c4629b64cd30c5b443db3124f3b02283d122ca.tar.gz |
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.
-rwxr-xr-x | .gitlab/ci.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index dd5649a02b..9ba3655192 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -616,16 +616,17 @@ function test_hadrian() { --test-have-intree-files \ --docs=none \ "runtest.opts+=${RUNTEST_ARGS:-}" || fail "cross-compiled hadrian main testsuite" + 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 |