[libcxx] r313502 - Fix two failing -verify tests to tolerate old and new clang versions

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Sun Sep 17 14:50:59 2017
New Revision: 313502

URL: http://llvm.org/viewvc/llvm-project?rev=313502&view=rev
Log:
Fix two failing -verify tests to tolerate old and new clang versions

Modified:
    libcxx/trunk/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp
    libcxx/trunk/test/std/utilities/utility/forward/forward.fail.cpp

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=313502&r1=313501&r2=313502&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 Sun Sep 17 14:50:59 2017
@@ -29,18 +29,18 @@ int main()
     any a;
 
     // expected-error at any:* {{binding value of type 'const TestType' to reference to type 'TestType' drops 'const' qualifier}}
-    // expected-error-re at any:* {{static_assert failed {{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
+    // expected-error-re at any:* {{static_assert failed{{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
     any_cast<TestType &>(static_cast<any const&>(a)); // expected-note {{requested here}}
 
     // expected-error at any:* {{cannot cast from lvalue of type 'const TestType' to rvalue reference type 'TestType &&'; types are not compatible}}
-    // expected-error-re at any:* {{static_assert failed {{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
+    // expected-error-re at any:* {{static_assert failed{{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
     any_cast<TestType &&>(static_cast<any const&>(a)); // expected-note {{requested here}}
 
     // expected-error at any:* {{binding value of type 'const TestType2' to reference to type 'TestType2' drops 'const' qualifier}}
-    // expected-error-re at any:* {{static_assert failed {{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
+    // expected-error-re at any:* {{static_assert failed{{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
     any_cast<TestType2 &>(static_cast<any const&&>(a)); // expected-note {{requested here}}
 
     // expected-error at any:* {{cannot cast from lvalue of type 'const TestType2' to rvalue reference type 'TestType2 &&'; types are not compatible}}
-    // expected-error-re at any:* {{static_assert failed {{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
+    // expected-error-re at any:* {{static_assert failed{{.*}} "ValueType is required to be a const lvalue reference or a CopyConstructible type"}}
     any_cast<TestType2 &&>(static_cast<any const&&>(a)); // expected-note {{requested here}}
 }

Modified: libcxx/trunk/test/std/utilities/utility/forward/forward.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/utility/forward/forward.fail.cpp?rev=313502&r1=313501&r2=313502&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/utility/forward/forward.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/utility/forward/forward.fail.cpp Sun Sep 17 14:50:59 2017
@@ -25,7 +25,7 @@ int main()
 #if TEST_STD_VER >= 11
     {
         std::forward<A&>(source());  // expected-note {{requested here}}
-        // expected-error-re at type_traits:* 1 {{static_assert failed {{.*}} "can not forward an rvalue as an lvalue"}}
+        // expected-error-re at type_traits:* 1 {{static_assert failed{{.*}} "can not forward an rvalue as an lvalue"}}
     }
 #else
     {