Merge pull request swiftlang#22462 from benlangmuir/disable-14-sk

Disable sourcekit-lsp and indexstore-db on Ubuntu 14.04

Author: shahmishal

utils/build-presets.ini

@@ -880,6 +880,8 @@ mixin-preset=
 # Ubuntu 14.04 preset for backwards compat and future customizations.
 [preset: buildbot_linux_1404]
 mixin-preset=buildbot_linux
+indexstore-db=0
+sourcekit-lsp=0
 
 # Ubuntu 14.04 preset that skips all tests except for integration testing of the
 # package.
@@ -919,6 +921,8 @@ long-test
 stress-test
 foundation
 lit-args=-v
+indexstore-db=0
+sourcekit-lsp=0
 
 [preset: buildbot_linux_armv7]
 release
@@ -1050,6 +1054,14 @@ dash-dash
 build-ninja
 reconfigure
 
+[preset: buildbot_incremental_linux_1404]
+mixin-preset=buildbot_incremental_linux
+indexstore-db=0
+sourcekit-lsp=0
+
+[preset: buildbot_incremental_linux_1404,long_test]
+mixin-preset=buildbot_incremental_linux_1404
+
 #===------------------------------------------------------------------------===#
 # OS X Package Builders
 #===------------------------------------------------------------------------===#

utils/build_swift/driver_arguments.py

@@ -532,9 +532,9 @@ def create_argument_parser():
     option(['--swiftevolve'], store_true('build_swiftevolve'),
            help='build the swift-evolve tool')
 
-    option(['--indexstore-db'], store_true('build_indexstoredb'),
+    option(['--indexstore-db'], toggle_true('build_indexstoredb'),
            help='build IndexStoreDB')
-    option(['--sourcekit-lsp'], store_true('build_sourcekitlsp'),
+    option(['--sourcekit-lsp'], toggle_true('build_sourcekitlsp'),
            help='build SourceKitLSP')
 
     option('--xctest', toggle_true('build_xctest'),

utils/build_swift/tests/expected_options.py

@@ -411,8 +411,6 @@ class IgnoreOption(_BaseOption):
     SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
     SetTrueOption('--skstresstester', dest='build_skstresstester'),
     SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
-    SetTrueOption('--indexstore-db', dest='build_indexstoredb'),
-    SetTrueOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
     SetTrueOption('-B', dest='benchmark'),
     SetTrueOption('-S', dest='skip_build'),
     SetTrueOption('-b', dest='build_llbuild'),
@@ -445,6 +443,8 @@ class IgnoreOption(_BaseOption):
     EnableOption('--host-test'),
     EnableOption('--libdispatch', dest='build_libdispatch'),
     EnableOption('--libicu', dest='build_libicu'),
+    EnableOption('--indexstore-db', dest='build_indexstoredb'),
+    EnableOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
     EnableOption('--long-test'),
     EnableOption('--show-sdks'),
     EnableOption('--stress-test'),