[libc++] Move aligned allocation tests to .verify.cpp

Instead of being ShTests that use clang-verify (and without the proper
REQUIRES annotation), create .verify.cpp tests instead with the right
REQUIRES annotation.

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
similarity index 85%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
index b4e7cee..6b1d62d 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new[](4);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
similarity index 85%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
index 61ff8b5..3b1494e 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new[](4, std::align_val_t{4});  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
similarity index 86%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
index d60b02e..14488f6 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new[](4, std::align_val_t{4}, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
similarity index 85%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
index 6966857..2af50ee 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new[](4, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
similarity index 85%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
index 05882ba..64706d3 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new(4, std::align_val_t{4});  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.sh.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
similarity index 86%
rename from libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.sh.cpp
rename to libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
index 9ff0a4a..5d6d168 100644 (file)
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.sh.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
@@ -13,14 +13,13 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
 
+// REQUIRES: verify-support
 // REQUIRES: -faligned-allocation
-// RUN: %{compile} %{verify} -faligned-allocation
+// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation
 
 #include <new>
 
-int main(int, char**)
-{
+int main(int, char**) {
     ::operator new(4, std::align_val_t{4}, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-
-  return 0;
+    return 0;
 }