Add --test-optimize-none-implicit-dynamic to build-script

Author: aschwaighofer

utils/build-script

@@ -206,6 +206,10 @@ class HostSpecificConfiguration(object):
                     self.swift_test_run_targets.append(
                         "check-swift{}-optimize_size-{}".format(
                             subset_suffix, name))
+                if args.test_optimize_none_implicit_dynamic and not test_host_only:
+                    self.swift_test_run_targets.append(
+                        "check-swift{}-optimize_none_implicit_dynamic-{}".format(
+                            subset_suffix, name))
 
 
 class BuildScriptInvocation(object):
@@ -720,6 +724,8 @@ class BuildScriptInvocation(object):
             impl_args += ["--skip-test-optimized"]
         if not args.test_optimize_for_size:
             impl_args += ["--skip-test-optimize-for-size"]
+        if not args.test_optimize_none_implicit_dynamic:
+            impl_args += ["--skip-test-optimize-none-implicit-dynamic"]
         if args.build_libparser_only:
             impl_args += ["--build-libparser-only"]
         if args.android:

utils/build-script-impl

@@ -174,6 +174,7 @@ KNOWN_SETTINGS=(
     skip-test-benchmarks        ""               "set to skip running Swift Benchmark Suite"
     skip-test-optimized         ""               "set to skip testing the test suite in optimized mode"
     skip-test-optimize-for-size ""               "set to skip testing the test suite in optimize for size mode"
+    skip-test-optimize-none-implicit-dynamic ""  "set to skip testing the test suite in optimize none with implicit dynamic mode"
     skip-test-sourcekit         ""               "set to skip testing SourceKit"
     stress-test-sourcekit       ""               "set to run the stress-SourceKit target"
     workspace                   "${HOME}/src"    "source directory containing llvm, clang, swift"
@@ -1498,6 +1499,9 @@ function calculate_targets_for_host() {
             if [[ $(not ${SKIP_TEST_OPTIMIZE_FOR_SIZE}) && ! -n "${test_host_only}" ]] ; then
                 SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_size-${stdlib_deployment_target}")
             fi
+            if [[ $(not ${SKIP_TEST_OPTIMIZE_NONE_IMPLICIT_DYNAMIC}) && ! -n "${test_host_only}" ]] ; then
+                SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_none_implicit_dynamic-${stdlib_deployment_target}")
+            fi
         fi
     done
 

utils/build_swift/driver_arguments.py

@@ -189,6 +189,10 @@ def _apply_default_arguments(args):
     if args.test_optimize_for_size:
         args.test = True
 
+    # --test-optimize-none-implicit-dynamic implies --test.
+    if args.test_optimize_none_implicit_dynamic:
+        args.test = True
+
     # If none of tests specified skip swift stdlib test on all platforms
     if not args.test and not args.validation_test and not args.long_test:
         args.test_linux = False
@@ -742,6 +746,14 @@ def create_argument_parser():
            help='run the test suite in optimize for size mode too '
                 '(implies --test)')
 
+    # FIXME: Convert to store_true action
+    option('-y', store('test_optimize_none_implicit_dynamic', const=True),
+           help='run the test suite in optimize none with implicit dynamic mode'
+                ' too (implies --test)')
+    option('--test-optimize-none-implicit-dynamic', toggle_true,
+           help='run the test suite in optimize none with implicit dynamic mode'
+                ' too (implies --test)')
+
     option('--long-test', toggle_true,
            help='run the long test suite')
 
@@ -956,6 +968,7 @@ def create_argument_parser():
     option('--common-cmake-options', unsupported)
     option('--only-execute', unsupported)
     option('--skip-test-optimize-for-size', unsupported)
+    option('--skip-test-optimize-none-implicit-dynamic', unsupported)
     option('--skip-test-optimized', unsupported)
 
     # -------------------------------------------------------------------------

utils/build_swift/tests/expected_options.py

@@ -183,6 +183,7 @@
     'test_ios_simulator': False,
     'test_linux': False,
     'test_optimize_for_size': None,
+    'test_optimize_none_implicit_dynamic': None,
     'test_optimized': None,
     'test_osx': False,
     'test_paths': [],
@@ -379,6 +380,7 @@ class IgnoreOption(_BaseOption):
     SetOption('-T', dest='validation_test', value=True),
     SetOption('-o', dest='test_optimized', value=True),
     SetOption('-s', dest='test_optimize_for_size', value=True),
+    SetOption('-y', dest='test_optimize_none_implicit_dynamic', value=True),
     SetOption('-t', dest='test', value=True),
 
     # FIXME: Convert these options to set_false actions
@@ -557,6 +559,7 @@ class IgnoreOption(_BaseOption):
     UnsupportedOption('--common-cmake-options'),
     UnsupportedOption('--only-execute'),
     UnsupportedOption('--skip-test-optimize-for-size'),
+    UnsupportedOption('--skip-test-optimize-none-implicit-dynamic'),
     UnsupportedOption('--skip-test-optimized'),
 
     # NOTE: LTO flag is a special case that acts both as an option and has

utils/build_swift/tests/test_driver_arguments.py

@@ -640,6 +640,11 @@ def test_implied_defaults_test_optimize_for_size(self):
             namespace = self.parse_default_args(['--test-optimize-for-size'])
             self.assertTrue(namespace.test)
 
+    def test_implied_defaults_test_optimize_for_size(self):
+        with self.assertNotRaises(ParserError):
+            namespace = self.parse_default_args(['--test-optimize-none-implicit-dynamic'])
+            self.assertTrue(namespace.test)
+
     def test_implied_defaults_skip_all_tests(self):
         with self.assertNotRaises(ParserError):
             namespace = self.parse_default_args([