Merge pull request #69063 from AnthonyLatsis/preset-cleanup

[NFC] Presets: Small cleanup

Author: AnthonyLatsis

utils/build-presets.ini

@@ -326,14 +326,19 @@ test
 validation-test
 lit-args=-v --time-tests
 
+# Set the vendor to apple
 compiler-vendor=apple
 
 # On buildbots, always force a reconfiguration to make sure we pick up changes
 # in the build-script and build-presets.ini.
 reconfigure
 
+# We want to always perform a verbose build
 verbose-build
+
+# Build ninja while we are at it
 build-ninja
+
 skip-test-cmark
 
 [preset: buildbot_incremental_base_all_platforms]
@@ -398,28 +403,6 @@ install-libcxx
 [preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
 
-[preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
-mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
-build-subdir=buildbot_incremental_xcode
-
-xcode
-# We do not support building cross compiled stdlibs on OS X with Xcode. So only
-# build the OS X SDK.
-skip-build-ios
-skip-test-ios
-skip-build-tvos
-skip-test-tvos
-skip-build-watchos
-skip-test-watchos
-stdlib-deployment-targets=macosx-x86_64
-swift-primary-variant-sdk=OSX
-swift-primary-variant-arch=x86_64
-skip-build-llbuild
-skip-test-llbuild
-skip-test-swiftpm
-skip-test-swift-driver
-skip-test-playgroundsupport
-
 # This preset is used by CI to test swift-corelibs-xctest.
 [preset: buildbot_incremental,tools=RA,stdlib=RA,XCTest]
 # We don't use buildbot_incremental_base_all_platforms because we don't need to
@@ -436,7 +419,6 @@ build-swift-stdlib-unittest-extra
 # 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.
-skip-test-cmark
 skip-test-swift
 skip-test-libdispatch
 skip-test-foundation
@@ -559,7 +541,6 @@ skip-test-swift
 skip-test-swiftpm
 skip-test-swift-driver
 skip-test-llbuild
-skip-test-cmark
 skip-test-playgroundsupport
 skip-test-swiftsyntax
 skip-test-skstresstester
@@ -608,24 +589,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
-# We run the OS X tests and validation tests.
-test
-validation-test
-
 llvm-targets-to-build=X86;ARM;AArch64;PowerPC
 
-# Set the vendor to apple
-compiler-vendor=apple
-
-# Always reconfigure cmake
-reconfigure
-
-# We want to always perform a verbose build
-verbose-build
-
-# Build ninja while we are at it
-build-ninja
-
 libcxx
 llbuild
 swiftpm
@@ -1738,7 +1703,6 @@ install-swiftsyntax
 install-libcxx
 
 skip-test-swift
-skip-test-cmark
 
 [preset: mixin_swiftpm_macos_platform]
 mixin-preset=