Simplify negative tests

Signed-off-by: Steffen Larsen <[email protected]>

Author: steffenlarsen

sycl/test/extensions/properties/properties_ctor_negative.cpp

@@ -5,18 +5,18 @@
 #include "mock_compile_time_properties.hpp"
 
 int main() {
-  // expected-error@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement 'detail::AllPropertyValues<std::tuple<int>>::value' "Unrecognized property in property list."}}
+  // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement {{.+}} "Unrecognized property in property list."}}
   // expected-error@+1 {{no viable constructor or deduction guide for deduction of template arguments of 'properties'}}
   auto InvalidPropertyList1 = sycl::ext::oneapi::experimental::properties(1);
-  // expected-error@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement 'detail::AllPropertyValues<std::tuple<sycl::ext::oneapi::experimental::foo, bool>>::value' "Unrecognized property in property list."}}
+  // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement {{.+}} "Unrecognized property in property list."}}
   // expected-error@+1 {{no viable constructor or deduction guide for deduction of template arguments of 'properties'}}
   auto InvalidPropertyList2 = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::foo{1}, true);
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'detail::AllUnique<std::tuple<sycl::ext::oneapi::experimental::foo, sycl::ext::oneapi::experimental::foo>>::value' "Duplicate properties in property list."}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Duplicate properties in property list."}}
   auto InvalidPropertyList3 = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::foo{0},
       sycl::ext::oneapi::experimental::foo{1});
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'detail::AllUnique<std::tuple<cl::sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::bar_key, void>, cl::sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::bar_key, void>>>::value' "Duplicate properties in property list."}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Duplicate properties in property list."}}
   auto InvalidPropertyList4 = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::bar,
       sycl::ext::oneapi::experimental::bar);

sycl/test/extensions/properties/properties_get_property_negative.cpp

@@ -6,12 +6,12 @@
 
 int main() {
   auto EmptyPropertyList = sycl::ext::oneapi::experimental::properties();
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'has_property<sycl::ext::oneapi::experimental::boo_key>()' "Property list does not contain the requested property."}}
-  // expected-error@+1 {{variable has incomplete type 'const void'}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // expected-error-re@+1 {{variable has incomplete type {{.+}}}}
   constexpr auto boo_val1 = decltype(EmptyPropertyList)::get_property<
       sycl::ext::oneapi::experimental::boo_key>();
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'has_property<sycl::ext::oneapi::experimental::foo>()' "Property list does not contain the requested property."}}
-  // expected-error@+1 {{no viable conversion from 'typename std::enable_if_t<detail::IsRuntimeProperty<foo>::value && !has_property<foo>(), void>' (aka 'void') to 'sycl::ext::oneapi::experimental::foo'}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // expected-error-re@+1 {{no viable conversion from {{.+}} to 'sycl::ext::oneapi::experimental::foo'}}
   sycl::ext::oneapi::experimental::foo foo_val1 =
       EmptyPropertyList
           .get_property<sycl::ext::oneapi::experimental::foo_key>();
@@ -20,12 +20,12 @@ int main() {
   auto PopulatedPropertyList = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::foz{.0f, true},
       sycl::ext::oneapi::experimental::bar);
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'has_property<sycl::ext::oneapi::experimental::boo_key>()' "Property list does not contain the requested property."}}
-  // expected-error@+1 {{variable has incomplete type 'const void'}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // expected-error-re@+1 {{variable has incomplete type {{.+}}}}
   constexpr auto boo_val2 = decltype(PopulatedPropertyList)::get_property<
       sycl::ext::oneapi::experimental::boo_key>();
-  // expected-error@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement 'has_property<sycl::ext::oneapi::experimental::foo>()' "Property list does not contain the requested property."}}
-  // expected-error@+1 {{no viable conversion from 'typename std::enable_if_t<detail::IsRuntimeProperty<foo>::value && !has_property<foo>(), void>' (aka 'void') to 'sycl::ext::oneapi::experimental::foo'}}
+  // expected-error-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // expected-error-re@+1 {{no viable conversion from {{.+}} to 'sycl::ext::oneapi::experimental::foo'}}
   sycl::ext::oneapi::experimental::foo foo_val2 =
       PopulatedPropertyList
           .get_property<sycl::ext::oneapi::experimental::foo_key>();