Skip to content

Commit b630e84

Browse files
authored
Merge pull request #1684 from swiftwasm/maxd/local-test-run-5.3
Fix local test runs by passing real test dir path in 5.3
2 parents 86ed257 + 40b69b0 commit b630e84

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

utils/webassembly/build-toolchain.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,4 @@ merge_toolchains
131131

132132
cd $DIST_TOOLCHAIN_DESTDIR
133133
tar cfz $PACKAGE_ARTIFACT $TOOLCHAIN_NAME
134+
echo "Toolchain archive created successfully!"

utils/webassembly/ci.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,26 @@ FLAGS="--release $CACHE_FLAGS --verbose"
2727

2828
$BUILD_SCRIPT $FLAGS
2929

30+
echo "Build script completed, will attempt to run test suites..."
31+
3032
if [[ "$(uname)" == "Darwin" ]]; then
3133
# workaround: host target test directory is necessary to use run-test
3234
mkdir -p $TARGET_BUILD_DIR/swift-macosx-x86_64/test-macosx-x86_64
35+
HOST_PLATFORM=macosx
36+
else
37+
HOST_PLATFORM=linux
3338
fi
3439

3540
if [[ "$(uname)" == "Linux" ]]; then
36-
$RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/
41+
$RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 \
42+
$TARGET_BUILD_DIR/swift-${HOST_PLATFORM}-x86_64/test-wasi-wasm32/stdlib
3743
echo "Skip running test suites for Linux"
3844
else
39-
40-
$RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/
45+
$RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 \
46+
$TARGET_BUILD_DIR/swift-${HOST_PLATFORM}-x86_64/test-wasi-wasm32/stdlib
4147

4248
# Run test but ignore failure temporarily
4349
$BUILD_SCRIPT $FLAGS -t || true
4450
fi
51+
52+
echo "The test suite has finished"

0 commit comments

Comments
 (0)