diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2024-06-17 20:36:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 20:36:14 -0400 |
| commit | 2cf2f1b2b6219b606faeade2342c3d2288658ab0 (patch) | |
| tree | 7fafcbf7f0598ba46379ebbe330828a67a62ee79 /libcxx/utils | |
| parent | 753498eed1d2d6d8c419bae5b65458640e5fbfd7 (diff) | |
| download | llvm-2cf2f1b2b6219b606faeade2342c3d2288658ab0.zip llvm-2cf2f1b2b6219b606faeade2342c3d2288658ab0.tar.gz llvm-2cf2f1b2b6219b606faeade2342c3d2288658ab0.tar.bz2 | |
[libc++] Test suite adjustments on macOS (#95835)
This patch makes a few adjustments to the way we run the tests in the
Apple configuration on macOS:
First, we stop using DYLD_LIBRARY_PATH. Using that environment variable
leads to libc++.dylib being replaced by the just-built one for the whole
process, and that assumes compatibility between the system-provided
dylib and the just-built one. Unfortunately, that is not the case
anymore due to typed allocation, which is only available in the system
one. Instead, we want to layer the just-built libc++ on top of the
system-provided one, which seems to be what happens when we set a rpath
instead.
Second, add a missing XFAIL for a std::print test that didn't work as
expected when building with availability annotations enabled. When we
enable these annotations, std::print falls back to a non-unicode and
non-terminal output, which breaks the test.
Diffstat (limited to 'libcxx/utils')
| -rwxr-xr-x | libcxx/utils/ci/apple-install-libcxx.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh index 15504f5..ddefabe 100755 --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/libcxx/utils/ci/apple-install-libcxx.sh @@ -127,9 +127,9 @@ for arch in ${architectures}; do -DCMAKE_OSX_ARCHITECTURES="${arch}" \ -DLIBCXXABI_LIBRARY_VERSION="${version}" \ -DLIBCXX_LIBRARY_VERSION="${version}" \ - -DLIBCXX_TEST_PARAMS="target_triple=${target}" \ - -DLIBCXXABI_TEST_PARAMS="target_triple=${target}" \ - -DLIBUNWIND_TEST_PARAMS="target_triple=${target}" + -DLIBCXX_TEST_PARAMS="target_triple=${target};stdlib=apple-libc++" \ + -DLIBCXXABI_TEST_PARAMS="target_triple=${target};stdlib=apple-libc++" \ + -DLIBUNWIND_TEST_PARAMS="target_triple=${target};stdlib=apple-libc++" if [ "$headers_only" = true ]; then xcrun cmake --build "${build_dir}/${arch}" --target install-cxx-headers install-cxxabi-headers -- -v |