Update tests for new static_assert message format

Author: dwoodwor-intel

sycl/test/basic_tests/buffer/buffer_for_not_device_copyable.cpp

@@ -13,7 +13,7 @@ int main() {
   static_assert(!is_device_copyable_v<std::string>);
   std::vector<std::string> sv{"hello", "sycl", "world"};
   buffer b2(sv.data(), range<1>(3));
-  //expected-error@CL/sycl/buffer.hpp:* {{"'std::string' is not a device copyable type"}}
+  //expected-error@CL/sycl/buffer.hpp:* {{'std::string' is not a device copyable type}}
 
   return 0;
 }

sycl/test/basic_tests/single_task_error_message.cpp

@@ -10,7 +10,7 @@ int main() {
     {
       myQueue
           .single_task([&](sycl::handler &cgh) {
-            // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}' "sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead"}}
+            // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}}
             // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}}
           })
           .wait();
@@ -26,7 +26,7 @@ int main() {
       myQueue
           .single_task(e,
                        [&](sycl::handler &cgh) {
-                         // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}' "sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead"}}
+                         // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}}
                          // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}}
                        })
           .wait();
@@ -42,7 +42,7 @@ int main() {
       myQueue
           .single_task(vector_event,
                        [&](sycl::handler &cgh) {
-                         // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}' "sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead"}}
+                         // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}}
                          // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}}
                        })
           .wait();

sycl/test/check_device_code/no_offset_error.cpp

@@ -12,7 +12,7 @@ int main() {
     q.submit([&](sycl::handler &cgh) {
         sycl::ext::oneapi::accessor_property_list PL{sycl::ext::oneapi::no_offset, sycl::no_init};
         sycl::accessor acc_a(a, cgh, sycl::write_only, PL);
-        // expected-error@CL/sycl/accessor.hpp:* {{static_assert failed due to requirement '!(accessor_property_list<sycl::ext::oneapi::property::no_offset::instance<true>, sycl::property::no_init>::has_property())' "Accessor has no_offset property, get_offset() can not be used"}}
+        // expected-error@CL/sycl/accessor.hpp:* {{static_assert failed due to requirement '!(accessor_property_list<sycl::ext::oneapi::property::no_offset::instance<true>, sycl::property::no_init>::has_property())': Accessor has no_offset property, get_offset() can not be used}}
         auto b = acc_a.get_offset();
     });
 

sycl/test/extensions/properties/properties_ctor_negative.cpp

@@ -5,18 +5,18 @@
 #include "mock_compile_time_properties.hpp"
 
 int main() {
-  // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement {{.+}} "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-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static_assert failed due to requirement {{.+}} "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-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "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-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "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,11 +6,11 @@
 
 int main() {
   auto EmptyPropertyList = sycl::ext::oneapi::experimental::properties();
-  // 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@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-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // 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
@@ -20,11 +20,11 @@ int main() {
   auto PopulatedPropertyList = sycl::ext::oneapi::experimental::properties(
       sycl::ext::oneapi::experimental::foz{.0f, true},
       sycl::ext::oneapi::experimental::bar);
-  // 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@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-re@sycl/ext/oneapi/properties/properties.hpp:* {{static_assert failed due to requirement {{.+}} "Property list does not contain the requested property."}}
+  // 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