Remove lit --param bootstrapping_mode

Author: atrick

test/CMakeLists.txt

@@ -175,11 +175,6 @@ if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
        "--param" "build_mode=${CMAKE_CFG_INTDIR}")
 endif()
 
-if (BOOTSTRAPPING_MODE)
-  list(APPEND SWIFT_LIT_ARGS
-       "--param" "bootstrapping_mode=${BOOTSTRAPPING_MODE}")
-endif()
-
 if (LLVM_USE_SANITIZER STREQUAL "Address")
   set(SWIFT_ASAN_BUILD TRUE)
 endif()

test/Driver/driver-compile.swift

@@ -65,7 +65,7 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // CHECK: bin{{/|\\\\}}swift
 // CHECK: Driver{{/|\\\\}}driver-compile.swift

test/Driver/linker-clang_rt.swift

@@ -39,7 +39,7 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // CHECK: {{(bin/)?}}ld{{(.exe)?"? }}
 // CHECK-NO-RUNTIME-NOT: libclang_rt

test/Driver/options-repl-darwin.swift

@@ -24,7 +24,7 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // CHECK-SWIFT-INVOKES-INTERPRETER: {{.*}}/swift-frontend -frontend -interpret
 

test/Driver/options-repl.swift

@@ -20,7 +20,7 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // LLDB: lldb{{(\.exe)?"?}} {{"?}}--repl=
 // LLDB-NOT: -module-name

test/Driver/subcommands.swift

@@ -22,7 +22,7 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // CHECK-SWIFT-INVOKES-INTERPRETER: {{.*}}/swift-frontend -frontend -interpret
 

test/Driver/windows-link-job.swift

@@ -4,6 +4,6 @@
 
 // swift-frontend cannot be copied to another location with bootstrapping because
 // it will not find the libswiftCore library with its relative RPATH.
-// UNSUPPORTED: bootstrapping_mode
+// UNSUPPORTED: swift_in_compiler
 
 // CHECK: {{^}}clang

test/lit.cfg

@@ -267,16 +267,6 @@ array_cow_checks = lit_config.params.get('array_cow_checks')
 if array_cow_checks is not None:
     config.available_features.add('array_cow_checks')
 
-bootstrapping_mode = lit_config.params.get('bootstrapping_mode')
-if bootstrapping_mode is not None:
-  config.available_features.add('swift_in_compiler')
-  if bootstrapping_mode == 'HOSTTOOLS':
-    config.available_features.add('hosttools_mode')
-  elif bootstrapping_mode == 'BOOTSTRAPPING':
-    config.available_features.add('bootstrapping_mode')
-  elif bootstrapping_mode == 'BOOTSTRAPPING-WITH-HOSTLIBS':
-    config.available_features.add('bootstrapping_with_hostlibs_mode')
-
 ###
 
 # Discover the Swift binaries to use.

test/lit.site.cfg.in

@@ -149,6 +149,16 @@ config.swift_stdlib_enable_objc_interop = "@SWIFT_STDLIB_ENABLE_OBJC_INTEROP@" =
 # Configured in DarwinSDKs.cmake
 config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
 
+if "@BOOTSTRAPPING_MODE@" != "OFF":
+  config.available_features.add('swift_in_compiler')
+
+if "@BOOTSTRAPPING_MODE@" == 'HOSTTOOLS':
+  config.available_features.add('hosttools_mode')
+elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING':
+  config.available_features.add('bootstrapping_mode')
+elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING-WITH-HOSTLIBS':
+  config.available_features.add('bootstrapping_with_hostlibs_mode')
+
 # Let the main config do the real work.
 if config.test_exec_root is None:
     config.test_exec_root = os.path.dirname(os.path.realpath(__file__))