Merge pull request #1342 from gottesmm/smoketest-preset

Mac OS X Smoketest preset

Author: gottesmm

utils/build-presets.ini

@@ -175,9 +175,6 @@ skip-test-watchos-host
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_incremental_base]
-# Build standard library and SDK overlay for iOS device and simulator.
-ios
-tvos
 test
 validation-test
 
@@ -198,9 +195,17 @@ build-swift-stdlib-unittest-extra=1
 compiler-vendor=apple
 
 
-[preset: buildbot_incremental,tools=RA,stdlib=RA]
+[preset: buildbot_incremental_base_all_platforms]
 mixin-preset=buildbot_incremental_base
 
+# Build standard library and SDK overlay for iOS device and simulator.
+
+ios
+tvos
+
+[preset: buildbot_incremental,tools=RA,stdlib=RA]
+mixin-preset=buildbot_incremental_base_all_platforms
+
 build-subdir=buildbot_incremental
 
 # Build Release without debug info, because it is faster to build.
@@ -222,7 +227,7 @@ skip-test-watchos
 
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,OnlytvOS]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental_OnlytvOS
 
@@ -239,7 +244,7 @@ skip-test-watchos
 
 
 [preset: buildbot_incremental_asan,tools=RDA,stdlib=RDA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental_asan
 
@@ -264,7 +269,7 @@ skip-test-watchos
 enable-asan
 
 [preset: buildbot_incremental_asan,tools=DA,stdlib=RDA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental_asan_debug
 
@@ -291,7 +296,7 @@ swift-stdlib-build-type=RelWithDebInfo
 
 
 [preset: buildbot_incremental_cross_compile_iphoneos,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental_cross_compile_iphoneos
 
@@ -305,7 +310,7 @@ cross-compile-tools-deployment-targets=iphoneos-arm64 iphoneos-armv7 iphoneos-ar
 
 
 [preset: buildbot_incremental_cross_compile_iphonesimulator,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental_cross_compile_iphonesimulator
 
@@ -317,6 +322,59 @@ 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
+
+# We build release+asserts.
+release
+assertions
+
+# We run the OSX tests and validation tests.
+test
+validation-test
+
+dash-dash
+
+# Always reconfigure cmake
+reconfigure
+
+# We want to always perform a verbose build
+verbose-build=1
+
+# Build ninja while we are at it
+build-ninja
+
+# Building a static stdlib would waste time.
+build-swift-static-stdlib=0
+
+# We need to build the unittest extras so we can test
+build-swift-stdlib-unittest-extra=1
+
+# Set the vendor to apple
+compiler-vendor=apple
+
+# Disable crash reporter. This will improve build time even more.
+darwin-crash-reporter-client=0
+
+# Make sure our stdlib is RA.
+swift-stdlib-build-type=RelWithDebInfo
+swift-stdlib-enable-assertions=true
+
+# Disable non-x86 building/testing.
+skip-build-ios
+skip-test-ios
+skip-build-tvos
+skip-test-tvos
+skip-build-watchos
+skip-test-watchos
+swift-sdks=OSX
+swift-primary-variant-sdk=OSX
+swift-primary-variant-arch=x86_64
+
+# Dont build the benchmarks
+skip-build-benchmarks=1
+
 #===------------------------------------------------------------------------===#
 # A setting to run a buildbot that passes extra swift args when compiling
 # modules that match regexp.
@@ -644,7 +702,7 @@ assertions
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_all_platforms,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental
 
@@ -669,7 +727,7 @@ skip-test-watchos-host
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_watch_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=buildbot_incremental_base_all_platforms
 
 build-subdir=buildbot_incremental