Fix python build scripts

Author: aschwaighofer

utils/build-script

@@ -206,10 +206,11 @@ 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:
+                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))
+                        "check-swift{}-optimize_none_implicit_dynamic-{}"
+                        .format(subset_suffix, name))
 
 
 class BuildScriptInvocation(object):

utils/build_swift/driver_arguments.py

@@ -748,11 +748,11 @@ def create_argument_parser():
 
     # 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)')
+           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)')
+           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')

utils/build_swift/tests/expected_options.py

@@ -452,6 +452,8 @@ class IgnoreOption(_BaseOption):
     EnableOption('--stress-test'),
     EnableOption('--test'),
     EnableOption('--test-optimize-for-size'),
+    EnableOption('--test-optimize-none-implicit-dynamic'),
+    EnableOption('--test-optimized'),
     EnableOption('--test-optimized'),
     EnableOption('--tvos'),
     EnableOption('--validation-test'),

utils/build_swift/tests/test_driver_arguments.py

@@ -640,9 +640,10 @@ 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):
+    def test_implied_defaults_test_optimize_none_implicit_dynamic(self):
         with self.assertNotRaises(ParserError):
-            namespace = self.parse_default_args(['--test-optimize-none-implicit-dynamic'])
+            namespace = self.parse_default_args(
+                ['--test-optimize-none-implicit-dynamic'])
             self.assertTrue(namespace.test)
 
     def test_implied_defaults_skip_all_tests(self):