Merge pull request #1848 from swiftwasm/katei/fix-broken-test-script

Fix broken test script

Author: kateinoigakukun

.github/workflows/main.yml

@@ -134,7 +134,9 @@ jobs:
           name: macos-installable
           path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-osx.tar.gz
       - name: Pack test results
-        run: tar cJf swift-test-results.tar.gz ../target-build/*/swift-macosx-x86_64/swift-test-results
+        working-directory: ${{ github.workspace }}/../
+        run: |
+          tar cJf ./swift/swift-test-results.tar.gz target-build/*/swift-macosx-x86_64/swift-test-results
       - name: Upload test results
         uses: actions/upload-artifact@v1
         with:

test/lit.cfg

@@ -1391,11 +1391,17 @@ elif run_os == 'wasi':
     # Exclude test cases that use objc-interop because clang doesn't support it
     # with WebAssembly binary file yet.
     def use_objc_interop(path):
-      with open(path) as f:
-        return '-enable-objc-interop' in f.read()
+      try:
+        with open(path) as f:
+          return '-enable-objc-interop' in f.read()
+      except:
+        return False
     def lldb_related_test(path):
-      with open(path) as f:
-        return 'lldb-moduleimport-test' in f.read()
+      try:
+        with open(path) as f:
+          return 'lldb-moduleimport-test' in f.read()
+      except:
+        return False
 
     def disabled_filenames(path):
       matches = []

utils/webassembly/ci.sh

@@ -5,11 +5,21 @@ set -ex
 SOURCE_PATH="$( cd "$(dirname $0)/../../.." && pwd  )" 
 SWIFT_PATH=$SOURCE_PATH/swift
 UTILS_PATH=$SWIFT_PATH/utils/webassembly
-if [[ "$(uname)" == "Linux" ]]; then
-  DEPENDENCIES_SCRIPT=$UTILS_PATH/linux/install-dependencies.sh
-else
-  DEPENDENCIES_SCRIPT=$UTILS_PATH/macos/install-dependencies.sh
-fi
+
+case $(uname -s) in
+  Darwin)
+    DEPENDENCIES_SCRIPT=$UTILS_PATH/macos/install-dependencies.sh
+    HOST_SUFFIX=macosx-x86_64
+  ;;
+  Linux)
+    DEPENDENCIES_SCRIPT=$UTILS_PATH/linux/install-dependencies.sh
+    HOST_SUFFIX=linux-x86_64
+  ;;
+  *)
+    echo "Unrecognised platform $(uname -s)"
+    exit 1
+  ;;
+esac
 
 BUILD_SCRIPT=$UTILS_PATH/build-toolchain.sh
 RUN_TEST_BIN=$SWIFT_PATH/utils/run-test
@@ -37,5 +47,5 @@ else
   $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/
 
   # Run test but ignore failure temporarily
-  $BUILD_SCRIPT -t || true
+  ninja check-swift-wasi-wasm32 -C $TARGET_BUILD_DIR/swift-$HOST_SUFFIX || true
 fi