Merge pull request swiftlang#8689 from apple/swift-4-update-presets

Author: swift-ci

utils/build-presets.ini

@@ -1114,9 +1114,31 @@ swiftpm
 
 dash-dash
 
-# Only run watchOS tests
 skip-test-swift
+skip-test-cmark
+skip-test-llbuild
+
+#===------------------------------------------------------------------------===#
+# Test llbuild on macOS builder
+#===------------------------------------------------------------------------===#
+
+[preset: buildbot_llbuild_macos_platform,tools=RA,stdlib=RA]
+mixin-preset=buildbot_incremental_base
+
+build-subdir=buildbot_incremental
+
+# Build Release without debug info, because it is faster to build.
+release
+assertions
 
+# Build llbuild & swiftpm here
+llbuild
+swiftpm
+
+dash-dash
+
+skip-test-swift
+skip-test-cmark
 
 #===------------------------------------------------------------------------===#
 # Remote Mirror Library
@@ -1260,6 +1282,7 @@ dash-dash
 skip-test-ios
 skip-test-tvos
 skip-test-watchos
+skip-reconfigure
 
 [preset: mixin_buildbot_incremental,test=iOS,type=simulator]
 
@@ -1272,6 +1295,7 @@ dash-dash
 skip-test-osx
 skip-test-tvos
 skip-test-watchos
+skip-reconfigure
 
 [preset: mixin_buildbot_incremental,test=tvOS,type=simulator]
 test
@@ -1283,6 +1307,7 @@ dash-dash
 skip-test-osx
 skip-test-watchos
 skip-test-ios
+skip-reconfigure
 
 [preset: mixin_buildbot_incremental,test=watchOS,type=simulator]
 
@@ -1295,6 +1320,7 @@ dash-dash
 skip-test-osx
 skip-test-tvos
 skip-test-ios
+skip-reconfigure
 
 #===------------------------------------------------------------------------===#
 # Swift Preset

utils/build-script-impl

@@ -99,6 +99,7 @@ KNOWN_SETTINGS=(
     installable-package         ""               "the path to the archive of the installation directory"
     test-installable-package    ""               "whether to run post-packaging tests on the produced package"
     reconfigure                 ""               "force a CMake configuration run even if CMakeCache.txt already exists"
+    skip-reconfigure            ""               "set to skip reconfigure"
     swift-primary-variant-sdk   ""               "default SDK for target binaries"
     swift-primary-variant-arch  ""               "default arch for target binaries"
     skip-build-cmark            ""               "set to skip building CommonMark"
@@ -943,6 +944,10 @@ if [[ "${CROSS_COMPILE_HOSTS}" ]]; then
     SKIP_BUILD_COMPILER_RT=1
 fi
 
+if [[ "${SKIP_RECONFIGURE}" ]]; then
+    RECONFIGURE=""
+fi
+
 # WORKSPACE, BUILD_DIR and INSTALLABLE_PACKAGE must be absolute paths
 case "${WORKSPACE}" in
     /*) ;;