Merge pull request #2192 from shahmishal/master

Author: swift-ci

utils/build-presets.ini

@@ -212,6 +212,7 @@ mixin-preset=buildbot_incremental_base
 
 ios
 tvos
+watchos
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA]
 mixin-preset=buildbot_incremental_base_all_platforms
@@ -236,22 +237,6 @@ skip-test-tvos
 skip-test-watchos
 
 
-[preset: buildbot_incremental,tools=RA,stdlib=RA,OnlytvOS]
-mixin-preset=buildbot_incremental_base_all_platforms
-
-build-subdir=buildbot_incremental_OnlytvOS
-
-# Build Release without debug info, because it is faster to build.
-release
-assertions
-
-dash-dash
-
-# This preset runs only tvOS tests.
-skip-test-osx
-skip-test-ios
-skip-test-watchos
-
 # 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
@@ -369,33 +354,6 @@ enable-asan
 swift-stdlib-build-type=RelWithDebInfo
 
 
-[preset: buildbot_incremental_cross_compile_iphoneos,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base_all_platforms
-
-build-subdir=buildbot_incremental_cross_compile_iphoneos
-
-# Build Release without debug info, because it is faster to build.
-release
-assertions
-
-dash-dash
-
-cross-compile-tools-deployment-targets=iphoneos-arm64 iphoneos-armv7 iphoneos-armv7s
-
-
-[preset: buildbot_incremental_cross_compile_iphonesimulator,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base_all_platforms
-
-build-subdir=buildbot_incremental_cross_compile_iphonesimulator
-
-# Build Release without debug info, because it is faster to build.
-release
-assertions
-
-dash-dash
-
-cross-compile-tools-deployment-targets=iphonesimulator-i386 iphonesimulator-x86_64
-
 [preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx]
 mixin-preset=buildbot_incremental_base
 build-subdir=buildbot_incremental