Skip to content

Commit ef7c951

Browse files
authored
Affirmative names for argument parsing namespace destinations. (#11952)
* Added new OptionalTrueAction and OptionalFalseAction classes to the arguments module. * Fixed missing return statement in help-test generator. * Renamed all the `skip_build_*` names to the more simple and affirmative `build_*`. * Renamed all the `skip_test_*` names to the more simple and affirmative `test_*`. * Added documentation to the OptionalTrueAction and OptionalFalseAction classes.
1 parent 6c43424 commit ef7c951

File tree

5 files changed

+329
-267
lines changed

5 files changed

+329
-267
lines changed

utils/build-script

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -268,80 +268,80 @@ class BuildScriptInvocation(object):
268268
# iterate over all supported platforms.
269269

270270
self.platforms_to_skip_build = set()
271-
if args.skip_build_linux:
271+
if not args.build_linux:
272272
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Linux)
273-
if args.skip_build_freebsd:
273+
if not args.build_freebsd:
274274
self.platforms_to_skip_build.add(StdlibDeploymentTarget.FreeBSD)
275-
if args.skip_build_cygwin:
275+
if not args.build_cygwin:
276276
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Cygwin)
277-
if args.skip_build_osx:
277+
if not args.build_osx:
278278
self.platforms_to_skip_build.add(StdlibDeploymentTarget.OSX)
279-
if args.skip_build_ios_device:
279+
if not args.build_ios_device:
280280
self.platforms_to_skip_build.add(StdlibDeploymentTarget.iOS)
281-
if args.skip_build_ios_simulator:
281+
if not args.build_ios_simulator:
282282
self.platforms_to_skip_build.add(
283283
StdlibDeploymentTarget.iOSSimulator)
284-
if args.skip_build_tvos_device:
284+
if not args.build_tvos_device:
285285
self.platforms_to_skip_build.add(StdlibDeploymentTarget.AppleTV)
286-
if args.skip_build_tvos_simulator:
286+
if not args.build_tvos_simulator:
287287
self.platforms_to_skip_build.add(
288288
StdlibDeploymentTarget.AppleTVSimulator)
289-
if args.skip_build_watchos_device:
289+
if not args.build_watchos_device:
290290
self.platforms_to_skip_build.add(StdlibDeploymentTarget.AppleWatch)
291-
if args.skip_build_watchos_simulator:
291+
if not args.build_watchos_simulator:
292292
self.platforms_to_skip_build.add(
293293
StdlibDeploymentTarget.AppleWatchSimulator)
294-
if args.skip_build_android:
294+
if not args.build_android:
295295
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Android)
296296

297297
self.platforms_to_skip_test = set()
298298
self.platforms_archs_to_skip_test = set()
299-
if args.skip_test_linux:
299+
if not args.test_linux:
300300
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Linux)
301-
if args.skip_test_freebsd:
301+
if not args.test_freebsd:
302302
self.platforms_to_skip_test.add(StdlibDeploymentTarget.FreeBSD)
303-
if args.skip_test_cygwin:
303+
if not args.test_cygwin:
304304
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Cygwin)
305-
if args.skip_test_osx:
305+
if not args.test_osx:
306306
self.platforms_to_skip_test.add(StdlibDeploymentTarget.OSX)
307-
if args.skip_test_ios_host:
307+
if not args.test_ios_device:
308308
self.platforms_to_skip_test.add(StdlibDeploymentTarget.iOS)
309309
else:
310310
exit_rejecting_arguments("error: iOS device tests are not " +
311311
"supported in open-source Swift.")
312-
if args.skip_test_ios_simulator:
312+
if not args.test_ios_simulator:
313313
self.platforms_to_skip_test.add(
314314
StdlibDeploymentTarget.iOSSimulator)
315-
if args.skip_test_ios_32bit_simulator:
315+
if not args.test_ios_32bit_simulator:
316316
self.platforms_archs_to_skip_test.add(
317317
StdlibDeploymentTarget.iOSSimulator.i386)
318-
if args.skip_test_tvos_host:
318+
if not args.test_tvos_device:
319319
self.platforms_to_skip_test.add(StdlibDeploymentTarget.AppleTV)
320320
else:
321321
exit_rejecting_arguments("error: tvOS device tests are not " +
322322
"supported in open-source Swift.")
323-
if args.skip_test_tvos_simulator:
323+
if not args.test_tvos_simulator:
324324
self.platforms_to_skip_test.add(
325325
StdlibDeploymentTarget.AppleTVSimulator)
326-
if args.skip_test_watchos_host:
326+
if not args.test_watchos_device:
327327
self.platforms_to_skip_test.add(StdlibDeploymentTarget.AppleWatch)
328328
else:
329329
exit_rejecting_arguments("error: watchOS device tests are not " +
330330
"supported in open-source Swift.")
331-
if args.skip_test_watchos_simulator:
331+
if not args.test_watchos_simulator:
332332
self.platforms_to_skip_test.add(
333333
StdlibDeploymentTarget.AppleWatchSimulator)
334334

335-
if args.skip_test_android_host:
335+
if not args.test_android_device:
336336
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Android)
337337

338338
self.platforms_to_skip_test_host = set()
339-
if args.skip_test_ios_host:
339+
if not args.test_ios_device:
340340
self.platforms_to_skip_test_host.add(StdlibDeploymentTarget.iOS)
341-
if args.skip_test_tvos_host:
341+
if not args.test_tvos_device:
342342
self.platforms_to_skip_test_host.add(
343343
StdlibDeploymentTarget.AppleTV)
344-
if args.skip_test_watchos_host:
344+
if not args.test_watchos_device:
345345
self.platforms_to_skip_test_host.add(
346346
StdlibDeploymentTarget.AppleWatch)
347347

@@ -501,7 +501,7 @@ class BuildScriptInvocation(object):
501501
impl_args += ["--skip-build-cmark",
502502
"--skip-build-llvm",
503503
"--skip-build-swift"]
504-
if args.skip_build_benchmarks:
504+
if not args.build_benchmarks:
505505
impl_args += ["--skip-build-benchmarks"]
506506
if not args.build_foundation:
507507
impl_args += ["--skip-build-foundation"]
@@ -532,27 +532,27 @@ class BuildScriptInvocation(object):
532532
if args.build_swift_static_sdk_overlay:
533533
impl_args += ["--build-swift-static-sdk-overlay"]
534534

535-
if args.skip_build_linux:
535+
if not args.build_linux:
536536
impl_args += ["--skip-build-linux"]
537-
if args.skip_build_freebsd:
537+
if not args.build_freebsd:
538538
impl_args += ["--skip-build-freebsd"]
539-
if args.skip_build_cygwin:
539+
if not args.build_cygwin:
540540
impl_args += ["--skip-build-cygwin"]
541-
if args.skip_build_osx:
541+
if not args.build_osx:
542542
impl_args += ["--skip-build-osx"]
543-
if args.skip_build_ios_device:
543+
if not args.build_ios_device:
544544
impl_args += ["--skip-build-ios-device"]
545-
if args.skip_build_ios_simulator:
545+
if not args.build_ios_simulator:
546546
impl_args += ["--skip-build-ios-simulator"]
547-
if args.skip_build_tvos_device:
547+
if not args.build_tvos_device:
548548
impl_args += ["--skip-build-tvos-device"]
549-
if args.skip_build_tvos_simulator:
549+
if not args.build_tvos_simulator:
550550
impl_args += ["--skip-build-tvos-simulator"]
551-
if args.skip_build_watchos_device:
551+
if not args.build_watchos_device:
552552
impl_args += ["--skip-build-watchos-device"]
553-
if args.skip_build_watchos_simulator:
553+
if not args.build_watchos_simulator:
554554
impl_args += ["--skip-build-watchos-simulator"]
555-
if args.skip_build_android:
555+
if not args.build_android:
556556
impl_args += ["--skip-build-android"]
557557

558558
if not args.test and not args.long_test:
@@ -568,29 +568,29 @@ class BuildScriptInvocation(object):
568568
"--skip-test-libicu",
569569
"--skip-test-playgroundlogger",
570570
"--skip-test-playgroundsupport"]
571-
if args.skip_test_linux:
571+
if not args.test_linux:
572572
impl_args += ["--skip-test-linux"]
573-
if args.skip_test_freebsd:
573+
if not args.test_freebsd:
574574
impl_args += ["--skip-test-freebsd"]
575-
if args.skip_test_cygwin:
575+
if not args.test_cygwin:
576576
impl_args += ["--skip-test-cygwin"]
577-
if args.skip_test_osx:
577+
if not args.test_osx:
578578
impl_args += ["--skip-test-osx"]
579-
if args.skip_test_ios_host:
579+
if not args.test_ios_device:
580580
impl_args += ["--skip-test-ios-host"]
581-
if args.skip_test_ios_simulator:
581+
if not args.test_ios_simulator:
582582
impl_args += ["--skip-test-ios-simulator"]
583-
if args.skip_test_ios_32bit_simulator:
583+
if not args.test_ios_32bit_simulator:
584584
impl_args += ["--skip-test-ios-32bit-simulator"]
585-
if args.skip_test_tvos_host:
585+
if not args.test_tvos_device:
586586
impl_args += ["--skip-test-tvos-host"]
587-
if args.skip_test_tvos_simulator:
587+
if not args.test_tvos_simulator:
588588
impl_args += ["--skip-test-tvos-simulator"]
589-
if args.skip_test_watchos_host:
589+
if not args.test_watchos_device:
590590
impl_args += ["--skip-test-watchos-host"]
591-
if args.skip_test_watchos_simulator:
591+
if not args.test_watchos_simulator:
592592
impl_args += ["--skip-test-watchos-simulator"]
593-
if args.skip_test_android_host:
593+
if not args.test_android_device:
594594
impl_args += ["--skip-test-android-host"]
595595
if args.build_runtime_with_host_compiler:
596596
impl_args += ["--build-runtime-with-host-compiler"]

0 commit comments

Comments
 (0)