From 27b4e005df3e2c7c6848d715e8aab89976ce5d0b Mon Sep 17 00:00:00 2001 From: Dario Rexin Date: Mon, 15 Dec 2025 09:19:39 -0800 Subject: [PATCH] [Tests] Allow wasmstdlib tests to be skipped For some reason the tests were always enabled when building the wasm stdlib. The build should respect the `-skip-test-wasmstdlib` flag. --- utils/build_swift/build_swift/driver_arguments.py | 7 +------ utils/build_swift/tests/expected_options.py | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py index 721e7836a0800..1064976fce14f 100644 --- a/utils/build_swift/build_swift/driver_arguments.py +++ b/utils/build_swift/build_swift/driver_arguments.py @@ -229,6 +229,7 @@ def _apply_default_arguments(args): args.test_swiftformat = False args.test_toolchainbenchmarks = False args.test_swiftdocc = False + args.test_wasmstdlib = False # --test implies --test-early-swift-driver # (unless explicitly skipped with `--skip-test-early-swift-driver`) @@ -295,10 +296,6 @@ 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.""" @@ -862,8 +859,6 @@ 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'), diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py index a28265dca3f15..e0cbefdc5b5c3 100644 --- a/utils/build_swift/tests/expected_options.py +++ b/utils/build_swift/tests/expected_options.py @@ -605,7 +605,6 @@ 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'),