diff options
author | Martin Storsjö <martin@martin.st> | 2022-07-07 23:38:38 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2022-08-11 10:15:12 +0300 |
commit | b8717d19cfd49bfdbd462ea42cd94b94959e4feb (patch) | |
tree | 081f62fe544ac7db46f20e8993a85b908c639329 /libcxx | |
parent | ebe0674acb8bb3404d0e2a6b689d5e3cd02bb0b6 (diff) | |
download | llvm-b8717d19cfd49bfdbd462ea42cd94b94959e4feb.zip llvm-b8717d19cfd49bfdbd462ea42cd94b94959e4feb.tar.gz llvm-b8717d19cfd49bfdbd462ea42cd94b94959e4feb.tar.bz2 |
[libcxx] [test] Merge the experimental-lib-exports testcases into static-lib-exports
Since bb939931a1adb9a47a2de13c359d6a72aeb277c8, the c++experimental
library is always built, so these tested files should always be built
(even if they aren't used in tests).
Differential Revision: https://reviews.llvm.org/D129399
Diffstat (limited to 'libcxx')
4 files changed, 6 insertions, 30 deletions
diff --git a/libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp b/libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp deleted file mode 100644 index 9ed32ef..0000000 --- a/libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp +++ /dev/null @@ -1,14 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -// REQUIRES: msvc && c++experimental - -// This file checks that the built experimental static library doesn't contain dllexport -// directives in clang-cl builds. - -// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.lib" | not grep -i "export:" > /dev/null diff --git a/libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp b/libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp index fb66c4a..447454e 100644 --- a/libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp +++ b/libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp @@ -8,7 +8,9 @@ // REQUIRES: msvc -// This file checks that the built static library doesn't contain dllexport +// This file checks that the built static libraries don't contain dllexport // directives in clang-cl builds. // RUN: llvm-readobj --coff-directives "%{lib}/libc++.lib" | not grep -i "export:" > /dev/null + +// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.lib" | not grep -i "export:" > /dev/null diff --git a/libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp b/libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp deleted file mode 100644 index 5aca961..0000000 --- a/libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp +++ /dev/null @@ -1,14 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -// REQUIRES: target={{.+}}-windows-gnu && c++experimental - -// This file checks that the built experimental static library doesn't contain dllexport -// directives in MinGW builds. - -// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.a" | not grep -i "export:" > /dev/null diff --git a/libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp b/libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp index 7dfedb7..8f29f5a 100644 --- a/libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp +++ b/libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp @@ -8,7 +8,9 @@ // REQUIRES: target={{.+}}-windows-gnu -// This file checks that the built static library doesn't contain dllexport +// This file checks that the built static libraries don't contain dllexport // directives in MinGW builds. // RUN: llvm-readobj --coff-directives "%{lib}/libc++.a" | not grep -i "export:" > /dev/null + +// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.a" | not grep -i "export:" > /dev/null |