[libcxx] r347780 - [libcxx] Use clang-verify in the lit test suite even when availability is enabled

[Louis Dionne]

Author: ldionne
Date: Wed Nov 28 09:31:17 2018
New Revision: 347780

URL: http://llvm.org/viewvc/llvm-project?rev=347780&view=rev
Log:
[libcxx] Use clang-verify in the lit test suite even when availability is enabled

Modified:
    libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp
    libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp
    libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp
    libcxx/trunk/utils/libcxx/test/config.py

Modified: libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp?rev=347780&r1=347779&r2=347780&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp Wed Nov 28 09:31:17 2018
@@ -22,6 +22,10 @@ struct TestType {};
 using std::any;
 using std::any_cast;
 
+// On platforms that do not support any_cast, an additional availability error
+// is triggered by these tests.
+// expected-error at any_cast_request_invalid_value_category.fail.cpp:* 0+ {{call to unavailable function 'any_cast': introduced in macOS 10.14}}
+
 void test_const_lvalue_cast_request_non_const_lvalue()
 {
     const any a;

Modified: libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp?rev=347780&r1=347779&r2=347780&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp Wed Nov 28 09:31:17 2018
@@ -21,6 +21,10 @@
 struct TestType {};
 struct TestType2 {};
 
+// On platforms that do not support any_cast, an additional availability error
+// is triggered by these tests.
+// expected-error at const_correctness.fail.cpp:* 0+ {{call to unavailable function 'any_cast': introduced in macOS 10.14}}
+
 int main()
 {
     using std::any;

Modified: libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp?rev=347780&r1=347779&r2=347780&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp Wed Nov 28 09:31:17 2018
@@ -40,6 +40,10 @@ struct no_move {
   no_move(no_move const&) {}
 };
 
+// On platforms that do not support any_cast, an additional availability error
+// is triggered by these tests.
+// expected-error at not_copy_constructible.fail.cpp:* 0+ {{call to unavailable function 'any_cast': introduced in macOS 10.14}}
+
 int main() {
     any a;
     // expected-error-re at any:* {{static_assert failed{{.*}} "ValueType is required to be an lvalue reference or a CopyConstructible type"}}

Modified: libcxx/trunk/utils/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/config.py?rev=347780&r1=347779&r2=347780&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/config.py (original)
+++ libcxx/trunk/utils/libcxx/test/config.py Wed Nov 28 09:31:17 2018
@@ -338,9 +338,6 @@ class Configuration(object):
 
     def configure_use_clang_verify(self):
         '''If set, run clang with -verify on failing tests.'''
-        if self.with_availability:
-            self.use_clang_verify = False
-            return
         self.use_clang_verify = self.get_lit_bool('use_clang_verify')
         if self.use_clang_verify is None:
             # NOTE: We do not test for the -verify flag directly because