Fix test failures when using a custom ABI namespace.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@364239 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/containers/views/span.tuple/tuple_size.fail.cpp b/test/std/containers/views/span.tuple/tuple_size.fail.cpp
index 1d3d5b3..d7a5440 100644
--- a/test/std/containers/views/span.tuple/tuple_size.fail.cpp
+++ b/test/std/containers/views/span.tuple/tuple_size.fail.cpp
@@ -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;
}
diff --git a/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp b/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp
index 46e26e7..8b883fd 100644
--- a/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp
+++ b/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp
@@ -29,5 +29,5 @@
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}}
}
