Merge pull request #83135 from MaxDesiatov/test-wasm-stdlib

build-script: allow `--test-wasm-stdlib` without `--build-wasm-stdlib`

This allows testing Wasm stdlib without fully rebuilding WASI sysroot and stdlib, while changes to stdlib itself are still detected by ninja as dependencies and are built incrementally, which is great for local builds.

Author: MaxDesiatov

utils/build_swift/build_swift/driver_arguments.py

@@ -292,6 +292,9 @@ def _apply_default_arguments(args):
         args.test_xros_host = False
         args.test_android_host = False
 
+    if args.build_wasmstdlib:
+        args.test_wasmstdlib = True
+
 
 def create_argument_parser():
     """Return a configured argument parser."""
@@ -829,6 +832,8 @@ def create_argument_parser():
     option(['--build-wasm-stdlib'], toggle_true('build_wasmstdlib'),
            help='build the stdlib for WebAssembly target into a'
                 'separate build directory ')
+    option('--test-wasm-stdlib', toggle_true('test_wasmstdlib'),
+           help='test stdlib for WebAssembly')
     option(['--wasmkit'], toggle_true('build_wasmkit'),
            help='build WasmKit')
     option(['--install-wasmkit'], toggle_true('install_wasmkit'),

utils/build_swift/tests/expected_options.py

@@ -328,7 +328,7 @@
     'test_swiftformat': False,
     'test_swiftdocc': False,
     'test_toolchainbenchmarks': False,
-    'test_wasmstdlib': True,
+    'test_wasmstdlib': False,
     'tvos': False,
     'tvos_all': False,
     'validation_test': None,
@@ -591,6 +591,7 @@ class BuildScriptImplOption(_BaseOption):
     SetTrueOption('--swiftdocc', dest='build_swiftdocc'),
     SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'),
     SetTrueOption('--build-wasm-stdlib', dest='build_wasmstdlib'),
+    SetTrueOption('--test-wasm-stdlib', dest='test_wasmstdlib'),
     SetTrueOption('--wasmkit', dest='build_wasmkit'),
     SetTrueOption('--build-stdlib-docs'),
     SetTrueOption('--preview-stdlib-docs'),

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -683,7 +683,9 @@ def compute_product_pipelines(self):
         builder.add_product(products.WasmKit,
                             is_enabled=self.args.build_wasmkit)
         builder.add_product(products.WasmStdlib,
-                            is_enabled=self.args.build_wasmstdlib)
+                            # Revert `or self.args.test_wasmstdlib` once we adopt `wasi-sdk-26`
+                            # or higher version that includes https://github.com/WebAssembly/wasi-libc/commit/eadb436d5c09f7983c3a687086e5af6b6e9f5510.patch
+                            is_enabled=self.args.build_wasmstdlib or self.args.test_wasmstdlib)
         builder.add_product(products.WasmThreadsStdlib,
                             is_enabled=self.args.build_wasmstdlib)
         builder.add_product(products.WasmSwiftSDK,