-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[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.
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
[test] Isolate build-script
calls in skip-local-build.test-sh
#37611
Conversation
@swift-ci please smoke test |
@edymtt is there a way to test the original issue in PR? I assume regular testing didn't cover it or you would have caught it before merging. Change LGTM |
@benlangmuir not at the moment, since I don't know why the permissions on that file changed in the first place -- in my investigation I was not able to reproduce this bug, even when running So before introducing logic for a failure I don't fully understand, I preferred to focus first on reducing any chance for existing tests to rebuild CMake to narrow down the scope (and in part to leverage the scale on the CI should this reoccur) |
This will align skip-local-build.test-sh with the behaviour of the other BuildSystem tests, by * ensuring we use the cmake exposed in lit.cfg, so that under Linux we don't attempt to rebuild it * using a separate build folder for build-script invocations, so that side effects will not affect the main invocation and other lit tests. I expect these changes to prevent llvm-targets-options.test to fail in Linux presets with an error related to cmake, e.g. ``` build-script: error: argument --cmake: /home/buildnode/jenkins/workspace/ oss-swift-package-linux-ubuntu-18_04/build/cmake-linux-x86_64/bin/cmake is not an executable ``` Addresses rdar://78320684
This was previously disabled in swiftlang#37573.
74223aa
to
d70b15d
Compare
@swift-ci please smoke test |
@swift-ci please smoke test macOS |
This will prevent the tests to rebuild CMake (especially under Linux) and cause transient issues. This is similar to what was done for swiftlang#37611
This will prevent the tests to rebuild CMake (especially under Linux) and cause transient issues. This is similar to what was done for #37611
...and reenable
llvm-targets-options.test
(previously disabled in #37573).This will align
skip-local-build.test-sh
with the behaviour of theother BuildSystem tests, by
cmake
exposed inlit.cfg
, so that under Linux wedon't attempt to rebuild it
build-script
invocations, so thatside effects will not affect the main invocation and other lit tests.
I expect these changes to prevent
llvm-targets-options.test
to fail in Linuxpresets with an error related to cmake, e.g.
Addresses rdar://78320684