Skip to content

Commit dc22a4d

Browse files
committed
[build-script] Track underlying CMake/lit changes
1 parent c00c18f commit dc22a4d

File tree

6 files changed

+25
-6
lines changed

6 files changed

+25
-6
lines changed

utils/build-presets.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ mixin-preset=
236236
test=0
237237
validation-test=0
238238
long-test=1
239+
stress-test=1
239240
test-optimized=0
240241

241242

@@ -747,6 +748,7 @@ release
747748
test
748749
validation-test
749750
long-test
751+
stress-test
750752
test-optimized
751753
foundation
752754
libdispatch
@@ -822,6 +824,7 @@ release
822824
test
823825
validation-test
824826
long-test
827+
stress-test
825828
foundation
826829
lit-args=-v
827830

@@ -892,6 +895,7 @@ mixin-preset=buildbot_incremental_linux
892895
test=0
893896
validation-test=0
894897
long-test=1
898+
stress-test=1
895899
test-optimized=0
896900

897901
[preset: buildbot_incremental_linux,llvm-only]
@@ -901,6 +905,7 @@ build-subdir=buildbot_incremental_llvmonly
901905
test=0
902906
validation-test=0
903907
long-test=0
908+
stress-test=0
904909
test-optimized=0
905910

906911
dash-dash
@@ -1022,6 +1027,7 @@ watchos
10221027
test
10231028
validation-test
10241029
long-test
1030+
stress-test
10251031

10261032
dash-dash
10271033

utils/build-script

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,12 @@ class HostSpecificConfiguration(object):
154154
test = False
155155

156156
if build:
157-
# Validation and long tests require building the full standard
158-
# library, whereas the other targets can build a slightly
159-
# smaller subset which is faster to build.
157+
# Validation, long, and stress tests require building the full
158+
# standard library, whereas the other targets can build a
159+
# slightly smaller subset which is faster to build.
160160
if args.build_swift_stdlib_unittest_extra or \
161-
args.validation_test or args.long_test:
161+
args.validation_test or args.long_test or \
162+
args.stress_test:
162163
self.swift_stdlib_build_targets.append(
163164
"swift-stdlib-" + name)
164165
else:
@@ -184,12 +185,15 @@ class HostSpecificConfiguration(object):
184185
else:
185186
suffix = ""
186187
subset_suffix = ""
187-
if args.validation_test and args.long_test:
188+
if args.validation_test and args.long_test and \
189+
args.stress_test:
188190
subset_suffix = "-all"
189191
elif args.validation_test:
190192
subset_suffix = "-validation"
191193
elif args.long_test:
192194
subset_suffix = "-only_long"
195+
elif args.stress_test:
196+
subset_suffix = "-only_stress"
193197
else:
194198
subset_suffix = ""
195199
self.swift_test_run_targets.append("check-swift{}{}-{}".format(
@@ -635,7 +639,7 @@ class BuildScriptInvocation(object):
635639
if not args.build_android:
636640
impl_args += ["--skip-build-android"]
637641

638-
if not args.test and not args.long_test:
642+
if not args.test and not args.long_test and not args.stress_test:
639643
impl_args += ["--skip-test-swift"]
640644
if not args.test:
641645
impl_args += ["--skip-test-cmark",
@@ -677,6 +681,8 @@ class BuildScriptInvocation(object):
677681
impl_args += ["--validation-test"]
678682
if args.long_test:
679683
impl_args += ["--long-test"]
684+
if args.stress_test:
685+
impl_args += ["--stress-test"]
680686
if not args.benchmark:
681687
impl_args += ["--skip-test-benchmarks"]
682688
if not args.test_optimized:

utils/build-script-impl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ KNOWN_SETTINGS=(
153153
skip-test-android-host "" "set to skip testing the host parts of the Android toolchain"
154154
validation-test "0" "set to run the validation test suite"
155155
long-test "0" "set to run the long test suite"
156+
stress-test "0" "set to run the stress test suite"
156157
test-paths "" "run tests located in specific directories and/or files"
157158
skip-test-benchmarks "" "set to skip running Swift Benchmark Suite"
158159
skip-test-optimized "" "set to skip testing the test suite in optimized mode"

utils/build_swift/driver_arguments.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,9 @@ def create_argument_parser():
703703
option('--long-test', toggle_true,
704704
help='run the long test suite')
705705

706+
option('--stress-test', toggle_true,
707+
help='run the stress test suite')
708+
706709
option('--host-test', toggle_true,
707710
help='run executable tests on host devices (such as iOS or tvOS)')
708711

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
'show_sdks': False,
150150
'skip_build': False,
151151
'stdlib_deployment_targets': None,
152+
'stress_test': False,
152153
'swift_analyze_code_coverage': defaults.SWIFT_ANALYZE_CODE_COVERAGE,
153154
'swift_assertions': True,
154155
'swift_build_variant': 'Debug',
@@ -423,6 +424,7 @@ class IgnoreOption(_BaseOption):
423424
EnableOption('--libicu', dest='build_libicu'),
424425
EnableOption('--long-test'),
425426
EnableOption('--show-sdks'),
427+
EnableOption('--stress-test'),
426428
EnableOption('--test'),
427429
EnableOption('--test-optimize-for-size'),
428430
EnableOption('--test-optimized'),

utils/build_swift/tests/test_driver_arguments.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ def test_implied_defaults_skip_all_tests(self):
645645
'--test', '0',
646646
'--validation-test', '0',
647647
'--long-test', '0',
648+
'--stress-test', '0',
648649
])
649650

650651
self.assertFalse(namespace.test_linux)

0 commit comments

Comments
 (0)