@@ -70,44 +70,35 @@ TEST_CASE("encoded thread name check", "[thrd][thrd_with_create_attrs][encoded-n
7070 const constexpr auto thrd_main1 = [](void * arg) -> int { \
7171 thread_with_id* t_id = (thread_with_id*)arg; \
7272 { \
73- t_id->name_set_result0 = ztdc_thrd_set_##given_prefix##name (t_id->thr , (given_type*)thread_name); \
74- REQUIRE (t_id->name_set_result0 == thrd_success); \
73+ t_id->name_set_result0 = ztdc_thrd_set_##given_prefix##name (t_id->thr , (given_type*)thread_name); \
7574 expected_char_t name_buf[128 ] = {}; \
7675 t_id->name_get_result0 = ztdc_thrd_get_##expected_prefix##name ( \
7776 t_id->thr , ztdc_c_array_size (name_buf), (expected_type*)name_buf); \
78- REQUIRE (t_id->name_get_result0 == thrd_success); \
7977 const expected_char_t * name = name_buf; \
8078 t_id->expected_name_result0 \
8179 = std::memcmp (name, &expected_thread_name[0 ], sizeof (expected_thread_name)); \
82- REQUIRE (t_id->expected_name_result0 == 0 ); \
8380 } \
8481 { \
8582 t_id->name_set_result1 = ztdc_thrd_set_##given_prefix##name_sized ( \
8683 t_id->thr , ztdc_c_string_ptr_size (thread_name), (given_type*)thread_name); \
87- REQUIRE (t_id->name_set_result1 == thrd_success); \
8884 expected_char_t name_buf[128 ] = {}; \
8985 t_id->name_get_result1 = ztdc_thrd_get_##expected_prefix##name ( \
9086 t_id->thr , ztdc_c_array_size (name_buf), (expected_type*)name_buf); \
91- REQUIRE (t_id->name_get_result1 == thrd_success); \
9287 const expected_char_t * name = name_buf; \
9388 t_id->expected_name_result1 \
9489 = std::memcmp (name, &expected_thread_name[0 ], sizeof (expected_thread_name)); \
95- REQUIRE (t_id->expected_name_result1 == 0 ); \
9690 } \
9791 { \
9892 /* flex case where the actual string portion given is not null-terminated... */ \
99- t_id->name_set_result2 = ztdc_thrd_set_##given_prefix##name_sized (t_id->thr , \
100- std::basic_string<given_char_t >(thread_name).find ((given_char_t )' !' ), (given_type*)thread_name); \
101- REQUIRE (t_id->name_set_result2 == thrd_success); \
93+ t_id->name_set_result2 = ztdc_thrd_set_##given_prefix##name_sized (t_id->thr , \
94+ std::basic_string<given_char_t >(thread_name).find ((given_char_t )' !' ), (given_type*)thread_name); \
10295 expected_char_t name_buf[128 ] = {}; \
10396 t_id->name_get_result2 = ztdc_thrd_get_##expected_prefix##name ( \
10497 t_id->thr , ztdc_c_array_size (name_buf), (expected_type*)name_buf); \
105- REQUIRE (t_id->name_get_result2 == thrd_success); \
10698 const expected_char_t * name = name_buf; \
10799 auto expected_name_size \
108100 = std::basic_string<expected_char_t >(expected_thread_name).find ((given_char_t )' !' ) \
109101 * sizeof (expected_char_t ); \
110- t_id->expected_name_result2 = std::memcmp (name, &expected_thread_name[0 ], expected_name_size); \
111102 REQUIRE (t_id->expected_name_result2 == 0 ); \
112103 } \
113104 return t_id->id ; \
0 commit comments