Skip to content

Commit 9e3a8b6

Browse files
committed
🚨 Just some additional testing, even if it won't work fully
1 parent f419163 commit 9e3a8b6

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

CMakePresets.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,25 @@
105105
"FETCHCONTENT_SOURCE_DIR_ZTD.CUNEICODE": "${sourceDir}/../cuneicode",
106106
"FETCHCONTENT_SOURCE_DIR_ZTD.ENCODING_TABLES": "${sourceDir}/../encoding_tables",
107107
"FETCHCONTENT_SOURCE_DIR_ZTD.IDK": "${sourceDir}/../idk",
108-
"CMAKE_CXX_STANDARD": "23",
108+
"CMAKE_CXX_STANDARD": "20",
109109
"CMAKE_C_STANDARD": "23"
110110
}
111111
},
112+
{
113+
"name": "local-base-gcc",
114+
"description": "Initial values for configuration (GCC for Windows)",
115+
"displayName": "Core values for user CMake builds (GCC for Windows)",
116+
"hidden": true,
117+
"condition": {
118+
"type": "equals",
119+
"lhs": "${hostSystemName}",
120+
"rhs": "Windows"
121+
},
122+
"cacheVariables": {
123+
"CMAKE_CXX_LINK_EXECUTABLE": "lld.exe",
124+
"CMAKE_C_LINK_EXECUTABLE": "lld.exe"
125+
}
126+
},
112127
{
113128
"name": "local-clang",
114129
"displayName": "Local Clang",
@@ -124,6 +139,7 @@
124139
"description": "Local default GCC configuration",
125140
"inherits": [
126141
"local-base",
142+
"local-base-gcc",
127143
"gcc"
128144
]
129145
},
@@ -686,4 +702,4 @@
686702
]
687703
}
688704
]
689-
}
705+
}

tests/basic_run_time/source/attr.encoded_name.c.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ TEST_CASE("encoded thread name check", "[thrd][thrd_with_create_attrs][encoded-n
121121
int res0 = 0; \
122122
thrd_join(t0_arg.thr, &res0); \
123123
REQUIRE(res0 == 0xF3); \
124+
REQUIRE(res0 == t0_arg.id); \
124125
REQUIRE(t0_arg.name_get_result0 == thrd_success); \
125126
REQUIRE(t0_arg.expected_name_result0 == 0); \
126127
\
@@ -129,6 +130,8 @@ TEST_CASE("encoded thread name check", "[thrd][thrd_with_create_attrs][encoded-n
129130
REQUIRE(create_err1 == thrd_success); \
130131
int res1 = 0; \
131132
thrd_join(t1_arg.thr, &res1); \
133+
REQUIRE(res1 == 0xF5) \
134+
REQUIRE(res1 == t1_arg.id); \
132135
REQUIRE(t1_arg.name_set_result0 == thrd_success); \
133136
REQUIRE(t1_arg.name_get_result0 == thrd_success); \
134137
REQUIRE(t1_arg.expected_name_result0 == 0); \
@@ -137,8 +140,7 @@ TEST_CASE("encoded thread name check", "[thrd][thrd_with_create_attrs][encoded-n
137140
REQUIRE(t1_arg.expected_name_result1 == 0); \
138141
REQUIRE(t1_arg.name_set_result2 == thrd_success); \
139142
REQUIRE(t1_arg.name_get_result2 == thrd_success); \
140-
REQUIRE(t1_arg.expected_name_result2 == 0); \
141-
REQUIRE(res1 == 0xF5)
143+
REQUIRE(t1_arg.expected_name_result2 == 0);
142144

143145
SECTION("c8/u8/ascii") {
144146
MAKE_TEST_BRACKET(c8, u8"meow?!", ztd_char8_t, c8, u8"meow?!", ztd_char8_t);

0 commit comments

Comments
 (0)