wasmstdlib.py: embedded stdlib not built for threads, exclude its tests

Author: MaxDesiatov

utils/swift_build_support/swift_build_support/products/wasmstdlib.py

@@ -213,6 +213,9 @@ def add_extra_cmake_options(self):
         self.cmake_options.define('SWIFT_THREADING_PACKAGE:STRING', 'none')
 
     def test(self, host_target):
+        self._test(host_target, 'wasm32-wasip1')
+
+    def _test(self, host_target, target_triple):
         build_root = os.path.dirname(self.build_dir)
         bin_paths = [
             os.path.join(self._host_swift_build_dir(host_target), 'bin'),
@@ -234,7 +237,14 @@ def test(self, host_target):
             'LIT_FILTER_OUT':
                 '(Concurrency/Runtime/clock.swift|stdlib/StringIndex.swift)',
         }
-        self.test_with_cmake(None, [test_target, 'check-swift-embedded-wasi'], self._build_variant, [], test_env=env)
+
+        # Embedded stdlib is not built for the threads triple, don't include embedded tests for it.
+        if target_triple == 'wasm32-wasip1-threads':
+            test_targets = [test_target]
+        else:
+            test_targets = [test_target, 'check-swift-embedded-wasi']
+
+        self.test_with_cmake(None, test_targets, self._build_variant, [], test_env=env)
 
     def should_test_executable(self) -> bool:
         return True
@@ -271,6 +281,9 @@ class WasmThreadsStdlib(WasmStdlib):
     def build(self, host_target):
         self._build(host_target, 'wasm32-wasip1-threads', 'wasip1-threads-wasm32')
 
+    def test(self, host_target):
+        self._test(host_target, 'wasm32-wasip1-threads')
+
     def should_test_executable(self):
         # TODO(katei): Enable tests once WasmKit supports WASI threads
         return False