Merge pull request #1554 from swiftwasm/maxd/local-test-run

Fix local test runs by passing real test dir path

Author: MaxDesiatov

utils/webassembly/build-toolchain.sh

@@ -125,3 +125,4 @@ merge_toolchains
 
 cd "$DIST_TOOLCHAIN_DESTDIR"
 tar cfz "$PACKAGE_ARTIFACT" "$TOOLCHAIN_NAME"
+echo "Toolchain archive created successfully!"

utils/webassembly/ci.sh

@@ -34,18 +34,26 @@ export SCCACHE_DIR="$SOURCE_PATH/build-cache"
 
 $BUILD_SCRIPT
 
+echo "Build script completed, will attempt to run test suites..."
+
 if [[ "$(uname)" == "Darwin" ]]; then
   # workaround: host target test directory is necessary to use run-test
   mkdir -p $TARGET_BUILD_DIR/swift-macosx-x86_64/test-macosx-x86_64
+  HOST_PLATFORM=macosx
+else
+  HOST_PLATFORM=linux
 fi
 
 if [[ "$(uname)" == "Linux" ]]; then
-  $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/
+  $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 \
+    $TARGET_BUILD_DIR/swift-${HOST_PLATFORM}-x86_64/test-wasi-wasm32/stdlib
   echo "Skip running test suites for Linux"
 else
-
-  $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/
+  $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 \
+ 	$TARGET_BUILD_DIR/swift-${HOST_PLATFORM}-x86_64/test-wasi-wasm32/stdlib
 
   # Run test but ignore failure temporarily
   ninja check-swift-wasi-wasm32 -C $TARGET_BUILD_DIR/swift-$HOST_SUFFIX || true
 fi
+
+echo "The test suite has finished"