[llvm-branch-commits] [libcxx] 8986376 - [libcxx] [test] Merge the experimental-lib-exports testcases into static-lib-exports

[Tobias Hieta via llvm-branch-commits]

Author: Martin Storsjö
Date: 2022-08-12T08:36:00+02:00
New Revision: 89863763f96d9ee0ea8121ddf78ef02c12274dcb

URL: https://github.com/llvm/llvm-project/commit/89863763f96d9ee0ea8121ddf78ef02c12274dcb
DIFF: https://github.com/llvm/llvm-project/commit/89863763f96d9ee0ea8121ddf78ef02c12274dcb.diff

LOG: [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

(cherry picked from commit b8717d19cfd49bfdbd462ea42cd94b94959e4feb)

Added: 
    

Modified: 
    libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp
    libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp

Removed: 
    libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp
    libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp


################################################################################
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 9ed32effe6969..0000000000000
--- 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 fb66c4a28fa08..447454ee229ca 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 5aca961536ee6..0000000000000
--- 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 7dfedb761f0c7..8f29f5ad051d4 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