diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 7d9a5c264c863..dc3826f228a96 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -14,8 +14,6 @@ # Buildbots for Darwin OSes #===------------------------------------------------------------------------===# [preset: mixin_buildbot_install_components] -dash-dash - swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;toolchain-tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers; [preset: mixin_buildbot_install_components_with_clang] @@ -32,8 +30,6 @@ validation-test lit-args=-v compiler-vendor=apple -dash-dash - verbose-build build-ninja @@ -60,8 +56,6 @@ mixin-preset= release assertions -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=false @@ -91,8 +85,6 @@ assertions test-optimized test-optimize-for-size -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=true @@ -110,8 +102,6 @@ assertions # Also run tests in optimized modes. test-optimized -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=true @@ -130,8 +120,6 @@ assertions test-optimized test-optimize-for-size -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=false @@ -144,8 +132,6 @@ mixin-preset= release no-assertions -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=false @@ -158,8 +144,6 @@ mixin-preset= release assertions -dash-dash - swift-stdlib-build-type=Debug swift-stdlib-enable-assertions=true @@ -168,8 +152,6 @@ swift-stdlib-enable-assertions=true mixin-preset= mixin_buildbot_tools_RA_stdlib_DA -dash-dash - # Don't run host tests for iOS, tvOS and watchOS platforms to make the build # faster. skip-test-ios-host @@ -192,8 +174,6 @@ skip-test-watchos-simulator mixin-preset= mixin_buildbot_tools_RA_stdlib_RD -dash-dash - # Don't run host tests for iOS, tvOS and watchOS platforms to make the build # faster. skip-test-ios-host @@ -216,8 +196,6 @@ skip-test-watchos-simulator mixin-preset= mixin_buildbot_tools_R_stdlib_RD -dash-dash - # Don't run host tests for iOS, tvOS and watchOS platforms to make the build # faster. skip-test-ios-host @@ -241,8 +219,6 @@ skip-test-watchos-simulator mixin-preset= mixin_buildbot_tools_RA_stdlib_RDA -dash-dash - # Don't run host tests for iOS, tvOS and watchOS platforms to make the build # faster. skip-test-ios-host @@ -300,8 +276,6 @@ skip-test-watchos-host # Build LLDB lldb -dash-dash - # Use the system debugserver to run the lldb swift tests lldb-no-debugserver lldb-use-system-debugserver @@ -320,8 +294,6 @@ lit-args=-v --time-tests compiler-vendor=apple -dash-dash - # On buildbots, always force a reconfiguration to make sure we pick up changes # in the build-script and build-presets.ini. reconfigure @@ -369,8 +341,6 @@ swiftevolve # Build Playground support playgroundsupport -dash-dash - # Only run OS X tests to make the build cycle faster. # We still build the iOS standard library though -- it is free given the # parallelism. @@ -390,7 +360,6 @@ mixin-preset=buildbot_incremental,tools=RA,stdlib=RA build-subdir=buildbot_incremental_xcode xcode -dash-dash # We do not support building cross compiled stdlibs on OS X with Xcode. So only # build the OS X SDK. skip-build-ios @@ -421,8 +390,6 @@ xctest build-swift-stdlib-unittest-extra -dash-dash - # This preset is meant to test XCTest, not Swift or Foundation. We don't # want stochastic failures in those test suites to prevent XCTest tests from # being run. @@ -440,8 +407,6 @@ assertions xctest test -dash-dash - skip-test-cmark skip-test-swift skip-test-foundation @@ -458,8 +423,6 @@ assertions build-swift-stdlib-unittest-extra -dash-dash - # FIXME: Swift/ASan does not support iOS yet. skip-build-ios skip-test-ios @@ -486,8 +449,6 @@ enable-tsan build-swift-stdlib-unittest-extra -dash-dash - skip-build-ios skip-test-ios skip-build-tvos @@ -506,8 +467,6 @@ assertions build-swift-stdlib-unittest-extra -dash-dash - # FIXME: Swift/UBSan does not support mac os x yet. skip-build-osx skip-test-osx @@ -537,8 +496,6 @@ assertions build-swift-stdlib-unittest-extra -dash-dash - # FIXME: Swift/ASan does not support iOS yet. skip-build-ios skip-test-ios @@ -576,8 +533,6 @@ llvm-targets-to-build=X86;ARM;AArch64;PowerPC # Set the vendor to apple compiler-vendor=apple -dash-dash - # Always reconfigure cmake reconfigure @@ -627,8 +582,6 @@ build-subdir=buildbot_incremental lto -dash-dash - [preset: buildbot_incremental,tools=RA,llvm-only] build-subdir=buildbot_incremental_llvmonly @@ -640,8 +593,6 @@ lit-args=-v compiler-vendor=apple -dash-dash - llvm-include-tests reconfigure verbose-build @@ -669,8 +620,6 @@ release assertions compiler-vendor=apple -dash-dash - # On buildbots, always force a reconfiguration to make sure we pick up changes # in the build-script and build-presets.ini. reconfigure @@ -704,8 +653,6 @@ mixin-preset=buildbot_incremental_asan,tools=RDA,stdlib=RDA [preset: buildbot_incremental_leaks] compiler-vendor=apple -dash-dash - # Disable ios. These builders are x86 only. skip-ios skip-tvos @@ -729,8 +676,6 @@ build-subdir=buildbot_incremental_leaks_RA_R release assertions -dash-dash - # We want our stdlib to not have assertions. swift-stdlib-enable-assertions=false @@ -756,8 +701,6 @@ assertions # swift-assertions # ... but our tests are expecting assertions to be either on or off everywhere. -dash-dash - # AST verifier slows down the compiler significantly. swift-enable-ast-verifier=0 @@ -786,8 +729,6 @@ xctest libicu libcxx -dash-dash - build-ninja install-llvm install-swift @@ -834,8 +775,6 @@ indexstore-db sourcekit-lsp lit-args=-v --time-tests -dash-dash - # rdar://problem/31454823 lldb-test-swift-only @@ -844,8 +783,6 @@ install-libdispatch reconfigure [preset: mixin_buildbot_linux,no_test] -dash-dash - skip-test-cmark skip-test-lldb skip-test-swift @@ -884,8 +821,6 @@ build-ninja libicu libcxx -dash-dash - android android-ndk=%(ndk_path)s android-api-level=21 @@ -923,8 +858,6 @@ reconfigure [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,aarch64] mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build -dash-dash - android-arch=aarch64 # Ubuntu 18.04 preset for backwards compat and future customizations. @@ -984,8 +917,6 @@ indexstore-db sourcekit-lsp lit-args=-v -dash-dash - install-foundation install-libdispatch reconfigure @@ -1018,8 +949,6 @@ xctest build-subdir=buildbot_linux -dash-dash - install-llvm install-swift install-lldb @@ -1059,8 +988,6 @@ test validation-test lit-args=-v -dash-dash - build-ninja reconfigure @@ -1081,8 +1008,6 @@ libdispatch swiftsyntax indexstore-db sourcekit-lsp -dash-dash - install-llvm install-swift install-llbuild @@ -1113,8 +1038,6 @@ long-test=0 stress-test=0 test-optimized=0 -dash-dash - skip-build-swift skip-build-cmark llvm-include-tests @@ -1151,8 +1074,6 @@ release-debuginfo assertions enable-lsan -dash-dash - build-ninja reconfigure @@ -1165,8 +1086,6 @@ enable-lsan debug-swift-stdlib debug-libdispatch -dash-dash - build-ninja reconfigure @@ -1210,8 +1129,6 @@ swiftsyntax-verify-generated-files release-debuginfo compiler-vendor=apple -dash-dash - # Cross compile for Apple Silicon cross-compile-hosts=macosx-arm64 @@ -1293,8 +1210,6 @@ validation-test long-test stress-test -dash-dash - lldb-test-swift-only # Path to the .tar.gz package we would create. @@ -1322,8 +1237,6 @@ mixin-preset= mixin_osx_package_base mixin_osx_package_test -dash-dash - no-assertions [preset: buildbot_osx_package,no_assertions,use_os_runtime] @@ -1345,8 +1258,6 @@ mixin-preset= mixin-preset= buildbot_osx_package,no_assertions -dash-dash - skip-test-swift skip-test-swiftpm skip-test-swift-driver @@ -1418,7 +1329,6 @@ mixin-preset= #===------------------------------------------------------------------------===# [preset: LLDB_Nested] -dash-dash skip-build-benchmarks install-destdir=%(swift_install_destdir)s llvm-targets-to-build=X86;ARM;AArch64;PowerPC;SystemZ;Mips @@ -1498,8 +1408,6 @@ install-libcxx # Build Playground support playgroundsupport -dash-dash - # Run the SIL verifier after each transform when building swift files sil-verify-all @@ -1555,8 +1463,6 @@ swiftevolve # Build Playground support playgroundsupport -dash-dash - # Skip build and test for tvOS skip-build-tvos skip-test-tvos @@ -1590,8 +1496,6 @@ build-swift-stdlib-unittest-extra llbuild swiftpm -dash-dash - # Only run watchOS tests skip-test-ios skip-test-tvos @@ -1911,8 +1815,6 @@ swift-assertions clang-user-visible-version=9.1.0 compiler-vendor=apple -dash-dash - build-ninja release-debuginfo reconfigure @@ -1938,8 +1840,6 @@ llvm-include-tests=0 [preset: remote_mirror_ios_customization] -dash-dash - darwin-xcrun-toolchain=ios darwin-deployment-version-ios=11.0 skip-build-osx @@ -1960,8 +1860,6 @@ mixin-preset= [preset: remote_mirror_watchos_customization] -dash-dash - darwin-xcrun-toolchain=watchos darwin-deployment-version-watchos=4.0 skip-build-osx @@ -1982,8 +1880,6 @@ mixin-preset= [preset: remote_mirror_tvos_customization] -dash-dash - darwin-xcrun-toolchain=tvos darwin-deployment-version-tvos=11.0 skip-build-osx @@ -2016,8 +1912,6 @@ ios tvos watchos -dash-dash - # On buildbots, always force a reconfiguration to make sure we pick up changes # in the build-script and build-presets.ini. reconfigure @@ -2033,8 +1927,6 @@ test validation-test lit-args=-v -dash-dash - skip-test-ios skip-test-tvos skip-test-watchos @@ -2046,8 +1938,6 @@ test validation-test lit-args=-v -dash-dash - skip-test-osx skip-test-tvos skip-test-watchos @@ -2058,8 +1948,6 @@ test validation-test lit-args=-v -dash-dash - skip-test-osx skip-test-watchos skip-test-ios @@ -2071,8 +1959,6 @@ test validation-test lit-args=-v -dash-dash - skip-test-osx skip-test-tvos skip-test-ios @@ -2090,8 +1976,6 @@ mixin-preset=mixin_buildbot_incremental,build release assertions -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=false @@ -2127,8 +2011,6 @@ mixin-preset=mixin_buildbot_incremental,build release assertions -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=true @@ -2175,8 +2057,6 @@ mixin-preset=mixin_buildbot_incremental,build release assertions -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=false @@ -2220,8 +2100,6 @@ mixin-preset=mixin_buildbot_incremental,build release assertions -dash-dash - [preset: buildbot_incremental,tools=RA,stdlib=RA,test=macOS,type=device] mixin-preset= buildbot_incremental,tools=RA,stdlib=RA,build @@ -2264,8 +2142,6 @@ assertions debug-llvm debug-swift -dash-dash - #===------------------------------------------------------------------------===# # Swift Preset # Tools: DebInfo and Assertions @@ -2280,8 +2156,6 @@ assertions debug-llvm debug-swift -dash-dash - swift-stdlib-build-type=RelWithDebInfo swift-stdlib-enable-assertions=true @@ -2313,8 +2187,6 @@ build-ninja build-subdir=LLVMClangSwift_iphoneos release -dash-dash - cross-compile-hosts=iphoneos-arm64 compiler-vendor=apple swift-primary-variant-sdk=IOS