Skip to content

Commit 7181ba4

Browse files
aschwaighoferaschwaighofer
authored
Merge pull request #25174 from aschwaighofer/fix-build-script-test-optimize-none-with-implicit-dynamic
 Fix build-script's handling of --test-optimize-none-with-implicit-dynamic
2 parents 269d306 + b33b40b commit 7181ba4

File tree

7 files changed

+27
-26
lines changed

7 files changed

+27
-26
lines changed

‎utils/build-script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ class BuildScriptInvocation(object):
509509
impl_args += ["--skip-test-optimized"]
510510
if not args.test_optimize_for_size:
511511
impl_args += ["--skip-test-optimize-for-size"]
512-
if not args.test_optimize_none_implicit_dynamic:
513-
impl_args += ["--skip-test-optimize-none-implicit-dynamic"]
512+
if not args.test_optimize_none_with_implicit_dynamic:
513+
impl_args += ["--skip-test-optimize-none-with-implicit-dynamic"]
514514
if args.build_libparser_only:
515515
impl_args += ["--build-libparser-only"]
516516
if args.android:

‎utils/build-script-impl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ KNOWN_SETTINGS=(
175175
skip-test-benchmarks "" "set to skip running Swift Benchmark Suite"
176176
skip-test-optimized "" "set to skip testing the test suite in optimized mode"
177177
skip-test-optimize-for-size "" "set to skip testing the test suite in optimize for size mode"
178-
skip-test-optimize-none-implicit-dynamic "" "set to skip testing the test suite in optimize none with implicit dynamic mode"
178+
skip-test-optimize-none-with-implicit-dynamic "" "set to skip testing the test suite in optimize none with implicit dynamic mode"
179179
skip-test-sourcekit "" "set to skip testing SourceKit"
180180
stress-test-sourcekit "" "set to run the stress-SourceKit target"
181181
only-executable-test "" "only run the executable variant of the swift lit tests"
@@ -1507,8 +1507,8 @@ function calculate_targets_for_host() {
15071507
if [[ $(not ${SKIP_TEST_OPTIMIZE_FOR_SIZE}) && ! -n "${test_host_only}" ]] ; then
15081508
SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_size-${stdlib_deployment_target}")
15091509
fi
1510-
if [[ $(not ${SKIP_TEST_OPTIMIZE_NONE_IMPLICIT_DYNAMIC}) && ! -n "${test_host_only}" ]] ; then
1511-
SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_none_implicit_dynamic-${stdlib_deployment_target}")
1510+
if [[ $(not ${SKIP_TEST_OPTIMIZE_NONE_WITH_IMPLICIT_DYNAMIC}) && ! -n "${test_host_only}" ]] ; then
1511+
SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_none_with_implicit_dynamic-${stdlib_deployment_target}")
15121512
fi
15131513
fi
15141514
done

‎utils/build_swift/driver_arguments.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ def _apply_default_arguments(args):
189189
if args.test_optimize_for_size:
190190
args.test = True
191191

192-
# --test-optimize-none-implicit-dynamic implies --test.
193-
if args.test_optimize_none_implicit_dynamic:
192+
# --test-optimize-none-with-implicit-dynamic implies --test.
193+
if args.test_optimize_none_with_implicit_dynamic:
194194
args.test = True
195195

196196
# If none of tests specified skip swift stdlib test on all platforms
@@ -760,10 +760,10 @@ def create_argument_parser():
760760
'(implies --test)')
761761

762762
# FIXME: Convert to store_true action
763-
option('-y', store('test_optimize_none_implicit_dynamic', const=True),
763+
option('-y', store('test_optimize_none_with_implicit_dynamic', const=True),
764764
help='run the test suite in optimize none with implicit dynamic'
765765
' mode too (implies --test)')
766-
option('--test-optimize-none-implicit-dynamic', toggle_true,
766+
option('--test-optimize-none-with-implicit-dynamic', toggle_true,
767767
help='run the test suite in optimize none with implicit dynamic'
768768
'mode too (implies --test)')
769769

@@ -997,7 +997,7 @@ def create_argument_parser():
997997
option('--common-cmake-options', unsupported)
998998
option('--only-execute', unsupported)
999999
option('--skip-test-optimize-for-size', unsupported)
1000-
option('--skip-test-optimize-none-implicit-dynamic', unsupported)
1000+
option('--skip-test-optimize-none-with-implicit-dynamic', unsupported)
10011001
option('--skip-test-optimized', unsupported)
10021002

10031003
# -------------------------------------------------------------------------

‎utils/build_swift/tests/expected_options.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
'test_ios_simulator': False,
189189
'test_linux': False,
190190
'test_optimize_for_size': None,
191-
'test_optimize_none_implicit_dynamic': None,
191+
'test_optimize_none_with_implicit_dynamic': None,
192192
'test_optimized': None,
193193
'test_osx': False,
194194
'test_paths': [],
@@ -385,7 +385,8 @@ class IgnoreOption(_BaseOption):
385385
SetOption('-T', dest='validation_test', value=True),
386386
SetOption('-o', dest='test_optimized', value=True),
387387
SetOption('-s', dest='test_optimize_for_size', value=True),
388-
SetOption('-y', dest='test_optimize_none_implicit_dynamic', value=True),
388+
SetOption('-y',
389+
dest='test_optimize_none_with_implicit_dynamic', value=True),
389390
SetOption('-t', dest='test', value=True),
390391
SetOption('-a', dest='assertions', value=True),
391392

@@ -463,7 +464,7 @@ class IgnoreOption(_BaseOption):
463464
EnableOption('--stress-test'),
464465
EnableOption('--test'),
465466
EnableOption('--test-optimize-for-size'),
466-
EnableOption('--test-optimize-none-implicit-dynamic'),
467+
EnableOption('--test-optimize-none-with-implicit-dynamic'),
467468
EnableOption('--test-optimized'),
468469
EnableOption('--tvos'),
469470
EnableOption('--validation-test'),
@@ -572,7 +573,7 @@ class IgnoreOption(_BaseOption):
572573
UnsupportedOption('--common-cmake-options'),
573574
UnsupportedOption('--only-execute'),
574575
UnsupportedOption('--skip-test-optimize-for-size'),
575-
UnsupportedOption('--skip-test-optimize-none-implicit-dynamic'),
576+
UnsupportedOption('--skip-test-optimize-none-with-implicit-dynamic'),
576577
UnsupportedOption('--skip-test-optimized'),
577578

578579
# NOTE: LTO flag is a special case that acts both as an option and has

‎utils/build_swift/tests/test_driver_arguments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,10 +640,10 @@ def test_implied_defaults_test_optimize_for_size(self):
640640
namespace = self.parse_default_args(['--test-optimize-for-size'])
641641
self.assertTrue(namespace.test)
642642

643-
def test_implied_defaults_test_optimize_none_implicit_dynamic(self):
643+
def test_implied_defaults_test_optimize_none_with_implicit_dynamic(self):
644644
with self.assertNotRaises(ParserError):
645645
namespace = self.parse_default_args(
646-
['--test-optimize-none-implicit-dynamic'])
646+
['--test-optimize-none-with-implicit-dynamic'])
647647
self.assertTrue(namespace.test)
648648

649649
def test_implied_defaults_skip_all_tests(self):

‎utils/swift_build_support/swift_build_support/host_specific_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ def __init__(self, host_target, args):
159159
self.swift_test_run_targets.append(
160160
"check-swift{}-optimize_size-{}".format(
161161
subset_suffix, name))
162-
if args.test_optimize_none_implicit_dynamic and \
162+
if args.test_optimize_none_with_implicit_dynamic and \
163163
not test_host_only:
164164
self.swift_test_run_targets.append(
165-
"check-swift{}-optimize_none_implicit_dynamic-{}"
165+
"check-swift{}-optimize_none_with_implicit_dynamic-{}"
166166
.format(subset_suffix, name))
167167

168168
def __platforms_to_skip_build(self, args):

‎utils/swift_build_support/tests/test_host_specific_configuration.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ def test(self):
541541
'test_optimize_for_size')
542542
test_should_test_optimizations_none_implicit_dynamic =\
543543
generate_should_test_optimizations(
544-
'optimize_none_implicit_dynamic',
545-
'test_optimize_none_implicit_dynamic')
544+
'optimize_none_with_implicit_dynamic',
545+
'test_optimize_none_with_implicit_dynamic')
546546

547547
def test_should_not_test_optimizations_when_testing_only_host(self):
548548
host_target = 'android-armv7'
@@ -554,15 +554,15 @@ def test_should_not_test_optimizations_when_testing_only_host(self):
554554
args.build_stdlib_deployment_targets = 'all'
555555
args.test_optimized = True
556556
args.test_optimize_for_size = True
557-
args.test_optimize_none_implicit_dynamic = True
557+
args.test_optimize_none_with_implicit_dynamic = True
558558

559559
before = HostSpecificConfiguration(host_target, args)
560560
self.assertIn('check-swift-optimize-android-armv7',
561561
before.swift_test_run_targets)
562562
self.assertIn('check-swift-optimize_size-android-armv7',
563563
before.swift_test_run_targets)
564564
self.assertIn(
565-
'check-swift-optimize_none_implicit_dynamic-android-armv7',
565+
'check-swift-optimize_none_with_implicit_dynamic-android-armv7',
566566
before.swift_test_run_targets)
567567

568568
args.test_android_host = True
@@ -573,7 +573,7 @@ def test_should_not_test_optimizations_when_testing_only_host(self):
573573
'check-swift-optimize_size-android-armv7',
574574
after.swift_test_run_targets)
575575
self.assertNotIn(
576-
'check-swift-optimize_none_implicit_dynamic-android-armv7',
576+
'check-swift-optimize_none_with_implicit_dynamic-android-armv7',
577577
after.swift_test_run_targets)
578578

579579
def test_should_test_optimizations_with_subsets(self):
@@ -586,7 +586,7 @@ def test_should_test_optimizations_with_subsets(self):
586586
args.build_stdlib_deployment_targets = 'all'
587587
args.test_optimized = True
588588
args.test_optimize_for_size = True
589-
args.test_optimize_none_implicit_dynamic = True
589+
args.test_optimize_none_with_implicit_dynamic = True
590590
args.long_test = True
591591

592592
target_name = 'check-swift-only_long-{}-android-armv7'
@@ -596,7 +596,7 @@ def test_should_test_optimizations_with_subsets(self):
596596
before.swift_test_run_targets)
597597
self.assertIn(target_name.format('optimize_size'),
598598
before.swift_test_run_targets)
599-
self.assertIn(target_name.format('optimize_none_implicit_dynamic'),
599+
self.assertIn(target_name.format('optimize_none_with_implicit_dynamic'),
600600
before.swift_test_run_targets)
601601

602602
def default_args(self):
@@ -627,7 +627,7 @@ def default_args(self):
627627
test_ios_32bit_simulator=False,
628628
test_linux=False,
629629
test_optimize_for_size=False,
630-
test_optimize_none_implicit_dynamic=False,
630+
test_optimize_none_with_implicit_dynamic=False,
631631
test_optimized=False,
632632
test_osx=False,
633633
test_tvos_host=False,

0 commit comments

Comments
 (0)