[Preset] Update split buildbot incremental presets

utils/build-presets.ini

@@ -324,78 +324,82 @@ skip-test-tvos
 skip-test-watchos
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,build]
-mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
-mixin-preset=buildbot_incremental_base_all_platforms
-
 build-subdir=buildbot_incremental
+compiler-vendor=apple
+
+# Build standard library and SDK overlay for iOS device and simulator.
+
+ios
+tvos
+watchos
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
-# Build llbuild & swiftpm here
-llbuild
-swiftpm
-
-# Build Playground support
-playgroundlogger
-playgroundsupport
-
 dash-dash
 
-skip-test-swift
+# On buildbots, always force a reconfiguration to make sure we pick up changes
+# in the build-script and build-presets.ini.
+reconfigure
+
+verbose-build
+build-ninja
+build-swift-stdlib-unittest-extra
+skip-build-benchmarks
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,test=macOS]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA,build
 
+test
+validation-test
+lit-args=-v
+
 dash-dash
 
 skip-test-ios
 skip-test-tvos
 skip-test-watchos
-skip-test-llbuild
-skip-test-swiftpm
-skip-test-playgroundlogger
-skip-test-playgroundsupport
+
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,test=iOS]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA,build
 
+test
+validation-test
+lit-args=-v
+
 dash-dash
 
 skip-test-osx
 skip-test-tvos
 skip-test-watchos
-skip-test-llbuild
-skip-test-swiftpm
-skip-test-playgroundlogger
-skip-test-playgroundsupport
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,test=watchOS]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA,build
 
+test
+validation-test
+lit-args=-v
+
 dash-dash
 
 skip-test-osx
 skip-test-tvos
 skip-test-ios
-skip-test-llbuild
-skip-test-swiftpm
-skip-test-playgroundlogger
-skip-test-playgroundsupport
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,test=tvOS]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA,build
 
+test
+validation-test
+lit-args=-v
+
 dash-dash
 
 skip-test-osx
 skip-test-watchos
 skip-test-ios
-skip-test-llbuild
-skip-test-swiftpm
-skip-test-playgroundlogger
-skip-test-playgroundsupport
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA