Merge pull request #32954 from buttaface/standalone

[test] Enable standalone_build feature properly and fix three tests

Author: davezarzycki

test/lit.site.cfg.in

@@ -93,9 +93,6 @@ if "@SWIFT_STDLIB_USE_NONATOMIC_RC@" == "TRUE":
 if "@SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS@" == "TRUE":
     config.available_features.add('runtime_function_counters')
 
-if "@SWIFT_BUILT_STANDALONE@" == "TRUE":
-    config.available_features.add('standalone_build')
-
 if "@CMAKE_GENERATOR@" == "Xcode":
     xcode_bin_dir = os.path.join(config.llvm_obj_root, "@LLVM_BUILD_TYPE@",
                                  'bin')

validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test

@@ -4,6 +4,13 @@
 
 # REQUIRES: standalone_build
 
+# Build and install the SwiftPM dependencies first.
+#
+# CHECK: --- Installing cmark ---
+# CHECK: --- Installing llvm ---
+# CHECK: --- Installing swift ---
+# CHECK: --- Installing llbuild ---
+
 # Just make sure we compute the build graph/emit output.
 #
 # CHECK: -- Build Graph Inference --
@@ -16,11 +23,7 @@
 # CHECK:     llvm
 # CHECK:     swift
 
-# Then make sure we are installing/building at the appropriate times.
+# Then make sure we are installing/building SwiftPM last.
 #
-# CHECK: --- Installing cmark ---
-# CHECK: --- Installing llvm ---
-# CHECK: --- Installing swift ---
-# CHECK: --- Installing llbuild ---
 # CHECK: --- Building swiftpm ---
 # CHECK: --- Installing swiftpm ---

validation-test/BuildSystem/install_all.test

@@ -2,7 +2,7 @@
 # RUN: mkdir -p %t
 # RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --install-all --cmake %cmake 2>&1 | %FileCheck %s
 
-# REQUIRES: standalone_test
+# REQUIRES: standalone_build
 
 # CHECK: --- Installing cmark ---
 # CHECK: --- Installing llvm ---

validation-test/BuildSystem/skip_cmark_swift_llvm.test

@@ -1,4 +1,4 @@
-# REQUIRES: standalone_test
+# REQUIRES: standalone_build
 
 # RUN: %empty-directory(%t)
 # RUN: mkdir -p %t

validation-test/lit.site.cfg.in

@@ -90,6 +90,9 @@ if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
 if "@SWIFT_STDLIB_USE_NONATOMIC_RC@" == "TRUE":
     config.available_features.add("nonatomic_rc")
 
+if "@SWIFT_BUILT_STANDALONE@" == "TRUE":
+    config.available_features.add('standalone_build')
+
 if "@CMAKE_GENERATOR@" == "Xcode":
     xcode_bin_dir = os.path.join(config.llvm_obj_root, "@LLVM_BUILD_TYPE@",
                                  'bin')