---

yaml
---
r: 327598
b: refs/heads/tensorflow
c: 69055f3
h: refs/heads/master

Author: benlangmuir

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 86649c3f1596e59294d64fea89b95b33f9107a0e
+refs/heads/tensorflow: 69055f38bdc8baa831e5b610b2d555edc354964c
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/utils/build-presets.ini

@@ -1506,47 +1506,28 @@ skip-test-llbuild
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_llbuild_macos_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
-
-build-subdir=buildbot_incremental
+mixin-preset=mixin_swiftpm_macos_platform
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
-# Build llbuild & swiftpm here
-llbuild
-swiftpm
-
-skip-test-swift
-skip-test-cmark
+# Downstream projects that import llbuild+SwiftPM.
+sourcekit-lsp
 
 #===------------------------------------------------------------------------===#
 # Test llbuild on Linux builder
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_llbuild_linux_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
-
-build-subdir=buildbot_incremental
+mixin-preset=mixin_swiftpm_linux_platform
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
-# Build llbuild & swiftpm here
-llbuild
-swiftpm
-
-xctest
-foundation
-llbuild
-
-skip-test-swift
-skip-test-cmark
-skip-test-foundation
-skip-test-libdispatch
-skip-test-xctest
+# Downstream projects that import llbuild+SwiftPM.
+sourcekit-lsp
 
 #===------------------------------------------------------------------------===#
 # Test SourceKit-LSP