Skip to content

[test] Enable standalone_build feature properly and fix three tests #32954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davezarzycki merged 1 commit into from
Jul 20, 2020
Merged

[test] Enable standalone_build feature properly and fix three tests #32954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions test/lit.site.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
13 changes: 8 additions & 5 deletions validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 --
Expand All @@ -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 ---
2 changes: 1 addition & 1 deletion validation-test/BuildSystem/install_all.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---
Expand Down
2 changes: 1 addition & 1 deletion validation-test/BuildSystem/skip_cmark_swift_llvm.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# REQUIRES: standalone_test
# REQUIRES: standalone_build

# RUN: %empty-directory(%t)
# RUN: mkdir -p %t
Expand Down
3 changes: 3 additions & 0 deletions validation-test/lit.site.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down