[libcxx-commits] [PATCH] D129399: [libcxx] [test] Merge the experimental-lib-exports testcases into static-lib-exports

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo updated this revision to Diff 451523.
mstorsjo added a comment.

Update the comment as suggested - and rebased, rerunning CI.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D129399/new/

https://reviews.llvm.org/D129399

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


Index: libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp
===================================================================
--- libcxx/test/libcxx/vendor/mingw/static-lib-exports.sh.cpp
+++ 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
Index: libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp
===================================================================
--- 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
Index: libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp
===================================================================
--- libcxx/test/libcxx/vendor/clang-cl/static-lib-exports.sh.cpp
+++ 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
Index: libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp
===================================================================
--- 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129399.451523.patch
Type: text/x-patch
Size: 3213 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220810/9f90e1b6/attachment.bin>