Skip to content

Commit 929b18c

Browse files
committed
Fix wasm linux test
1 parent 9da148f commit 929b18c

3 files changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/ubuntu_wasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
source ./emsdk/emsdk_env.sh
2323
emcmake cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -DCMAKE_BUILD_TYPE:STRING=Release -Btarget
2424
- name: Build
25-
run: cmake --build target
25+
run: cmake --build target
2626
- name: Test
2727
run: ctest --test-dir target -C Release -T test --output-on-failure -VV
2828
- name: Release

interface/core/types/types_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace hud::common
2929
using f64 = double; // 64 bits f64 (IEEE 754)
3030

3131
#if defined(HD_TARGET_32_BITS)
32-
// Pointer types
32+
// Pointer types
3333
using uptr = u32; // unsigned integer same size as a pointer
3434
using iptr = i32; // signed integer same size as a pointer
3535

test/traits/traits_is_bitwise_copyable.cpp

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,14 +264,21 @@ GTEST_TEST(traits, is_bitwise_copyable)
264264
#if defined(HD_HOST_WINDOWS)
265265
hud_assert_true((hud::is_bitwise_copyable_v<wchar, char16>));
266266
hud_assert_false((hud::is_bitwise_copyable_v<wchar, char32>));
267+
hud_assert_false((hud::is_bitwise_copyable_v<wchar, iptr>));
268+
hud_assert_false((hud::is_bitwise_copyable_v<wchar, uptr>));
267269
#else
268270
hud_assert_false((hud::is_bitwise_copyable_v<wchar, char16>));
269271
hud_assert_true((hud::is_bitwise_copyable_v<wchar, char32>));
272+
#if defined(HD_TARGET_32_BITS)
273+
hud_assert_true((hud::is_bitwise_copyable_v<wchar, iptr>));
274+
hud_assert_true((hud::is_bitwise_copyable_v<wchar, uptr>));
275+
#else
276+
hud_assert_false((hud::is_bitwise_copyable_v<wchar, iptr>));
277+
hud_assert_false((hud::is_bitwise_copyable_v<wchar, uptr>));
278+
#endif
270279
#endif
271280
hud_assert_false((hud::is_bitwise_copyable_v<wchar, f32>));
272281
hud_assert_false((hud::is_bitwise_copyable_v<wchar, f64>));
273-
hud_assert_false((hud::is_bitwise_copyable_v<wchar, iptr>));
274-
hud_assert_false((hud::is_bitwise_copyable_v<wchar, uptr>));
275282

276283
// char16
277284
hud_assert_false((hud::is_bitwise_copyable_v<char16, i8>));
@@ -373,12 +380,17 @@ GTEST_TEST(traits, is_bitwise_copyable)
373380
#if defined(HD_TARGET_32_BITS)
374381
hud_assert_true((hud::is_bitwise_copyable_v<iptr, u32>));
375382
hud_assert_false((hud::is_bitwise_copyable_v<iptr, u64>));
383+
#if defined(HD_HOST_WINDOWS)
384+
hud_assert_false((hud::is_bitwise_copyable_v<iptr, wchar>));
385+
#else
386+
hud_assert_true((hud::is_bitwise_copyable_v<iptr, wchar>));
387+
#endif
376388
#else
377389
hud_assert_false((hud::is_bitwise_copyable_v<iptr, u32>));
378390
hud_assert_true((hud::is_bitwise_copyable_v<iptr, u64>));
391+
hud_assert_false((hud::is_bitwise_copyable_v<iptr, wchar>));
379392
#endif
380393
hud_assert_false((hud::is_bitwise_copyable_v<iptr, char8>));
381-
hud_assert_false((hud::is_bitwise_copyable_v<iptr, wchar>));
382394
hud_assert_false((hud::is_bitwise_copyable_v<iptr, char16>));
383395
#if defined(HD_TARGET_32_BITS)
384396
hud_assert_true((hud::is_bitwise_copyable_v<iptr, char32>));
@@ -405,12 +417,17 @@ GTEST_TEST(traits, is_bitwise_copyable)
405417
#if defined(HD_TARGET_32_BITS)
406418
hud_assert_true((hud::is_bitwise_copyable_v<uptr, u32>));
407419
hud_assert_false((hud::is_bitwise_copyable_v<uptr, u64>));
420+
#if defined(HD_HOST_WINDOWS)
421+
hud_assert_false((hud::is_bitwise_copyable_v<uptr, wchar>));
422+
#else
423+
hud_assert_true((hud::is_bitwise_copyable_v<uptr, wchar>));
424+
#endif
408425
#else
409426
hud_assert_false((hud::is_bitwise_copyable_v<uptr, u32>));
410427
hud_assert_true((hud::is_bitwise_copyable_v<uptr, u64>));
428+
hud_assert_false((hud::is_bitwise_copyable_v<uptr, wchar>));
411429
#endif
412430
hud_assert_false((hud::is_bitwise_copyable_v<uptr, char8>));
413-
hud_assert_false((hud::is_bitwise_copyable_v<uptr, wchar>));
414431
hud_assert_false((hud::is_bitwise_copyable_v<uptr, char16>));
415432
#if defined(HD_TARGET_32_BITS)
416433
hud_assert_true((hud::is_bitwise_copyable_v<uptr, char32>));

0 commit comments

Comments
 (0)