[libcxx-commits] [libcxx] r364239 - Fix test failures when using a custom ABI namespace.

[Richard Smith via libcxx-commits]

Author: rsmith
Date: Mon Jun 24 14:46:05 2019
New Revision: 364239

URL: http://llvm.org/viewvc/llvm-project?rev=364239&view=rev
Log:
Fix test failures when using a custom ABI namespace.

Modified:
    libcxx/trunk/test/std/containers/views/span.tuple/tuple_size.fail.cpp
    libcxx/trunk/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp

Modified: libcxx/trunk/test/std/containers/views/span.tuple/tuple_size.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.tuple/tuple_size.fail.cpp?rev=364239&r1=364238&r2=364239&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.tuple/tuple_size.fail.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.tuple/tuple_size.fail.cpp Mon Jun 24 14:46:05 2019
@@ -15,7 +15,7 @@
 
 int main(int, char**)
 {
-    (void) std::tuple_size<std::span<double>>::value; // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size<std::__1::span<double, {{.*}}}}
-    (void) std::tuple_size<std::span<int>>::value;    // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size<std::__1::span<int, {{.*}}}}
+    (void) std::tuple_size<std::span<double>>::value; // expected-error-re {{implicit instantiation of undefined template 'std:{{.*}}:tuple_size<std:{{.*}}:span<double, {{.*}}}}
+    (void) std::tuple_size<std::span<int>>::value;    // expected-error-re {{implicit instantiation of undefined template 'std:{{.*}}:tuple_size<std:{{.*}}:span<int, {{.*}}}}
     return 0;
 }

Modified: libcxx/trunk/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp?rev=364239&r1=364238&r2=364239&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp (original)
+++ libcxx/trunk/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp Mon Jun 24 14:46:05 2019
@@ -29,5 +29,5 @@ int main(int, char**)
     std::variant<NotCopyConstructible> v;
     std::variant<NotCopyConstructible> v1;
     std::variant<NotCopyConstructible> v2(v); // expected-error {{call to implicitly-deleted copy constructor of 'std::variant<NotCopyConstructible>'}}
-    v1 = v; // expected-error {{object of type 'std::__1::variant<NotCopyConstructible>' cannot be assigned because its copy assignment operator is implicitly deleted}}
+    v1 = v; // expected-error-re {{object of type 'std:{{.*}}:variant<NotCopyConstructible>' cannot be assigned because its copy assignment operator is implicitly deleted}}
 }