From 09e30ef00c95d584b51d902cf25aa96c5b53e137 Mon Sep 17 00:00:00 2001 From: Butta Date: Fri, 17 Jul 2020 23:38:29 +0530 Subject: [PATCH] [test] Enable standalone_build feature properly and fix three tests Two tests were mislabeled and a third needed its output reordered. --- test/lit.site.cfg.in | 3 --- .../infer_dumps_deps_if_verbose_build.test | 13 ++++++++----- validation-test/BuildSystem/install_all.test | 2 +- .../BuildSystem/skip_cmark_swift_llvm.test | 2 +- validation-test/lit.site.cfg.in | 3 +++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 8ae8fb95a8fcd..fba70c48db7ce 100644 --- a/test/lit.site.cfg.in +++ b/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') diff --git a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test b/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test index 0bb88a9672113..16fc073567452 100644 --- a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test +++ b/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 --- diff --git a/validation-test/BuildSystem/install_all.test b/validation-test/BuildSystem/install_all.test index 63d0ca62f3f9a..41b841ae9204e 100644 --- a/validation-test/BuildSystem/install_all.test +++ b/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 --- diff --git a/validation-test/BuildSystem/skip_cmark_swift_llvm.test b/validation-test/BuildSystem/skip_cmark_swift_llvm.test index 223410c03ab0a..3b7166319a67b 100644 --- a/validation-test/BuildSystem/skip_cmark_swift_llvm.test +++ b/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 diff --git a/validation-test/lit.site.cfg.in b/validation-test/lit.site.cfg.in index 343ddb16bb1de..12aaec7150e00 100644 --- a/validation-test/lit.site.cfg.in +++ b/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')