Skip to content

[test] Isolate build-script calls in skip-local-build.test-sh #37611

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
merged 2 commits into from
May 25, 2021
Merged

[test] Isolate build-script calls in skip-local-build.test-sh #37611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7379f45
[test] Isolate build-script calls in skip-local-build.test-sh
edymtt May 24, 2021
d70b15d
Reenable `llvm-targets-options.test`
edymtt May 24, 2021
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 validation-test/BuildSystem/llvm-targets-options.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Failing in CI with "%cmake is not an executable" rdar://78320684
# UNSUPPORTED: OS=linux-gnu

# REQUIRES: standalone_build

# RUN: %empty-directory(%t)
Expand Down
8 changes: 5 additions & 3 deletions validation-test/BuildSystem/skip-local-build.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# REQUIRES: standalone_build
#
# RUN: %swift_src_root/utils/build-script --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG

# RUN: %empty-directory(%t)
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --cmake %cmake --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG
# CONFIG: "skip_local_build": true

# RUN: %swift_src_root/utils/build-script --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY
# RUN: %empty-directory(%t)
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --cmake %cmake --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY
# DRY: build-script-impl
# DRY-SAME: --skip-local-build