mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests that now fail to compile

This commit is contained in:
duncanspumpkin 2023-02-21 21:25:36 +00:00
parent aee3f17b93
commit 2ea289d5c6
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -263,7 +263,7 @@ jobs:
- platform: x86_64
distro: focal
image: openrct2/openrct2-build:8-focal
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz"
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off
- platform: x86_64
distro: jammy
image: openrct2/openrct2-build:8-jammy
@ -271,7 +271,7 @@ jobs:
- platform: x86_64
distro: bullseye
image: openrct2/openrct2-build:8-bullseye
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
- platform: i686
distro: focal
image: openrct2/openrct2-build:8-focal32

8
test/tests/BitSetTests.cpp
View File

@ -15,11 +15,7 @@ using namespace OpenRCT2;
TEST(BitTest, test_index_construction)
{
BitSet<64u> bits({ 0u, 2u, 4u, 6u, 8u, 10u });
#if defined(_M_X64) || defined(_M_ARM64)
static_assert(std::is_same_v<decltype(bits)::BlockType, uint64_t>);
#else
static_assert(std::is_same_v<decltype(bits)::BlockType, uint32_t>);
#endif
static_assert(sizeof(decltype(bits)::BlockType) == sizeof(uintptr_t));
constexpr auto size = sizeof(bits);
static_assert(size == 8u);
@ -94,7 +90,7 @@ TEST(BitTest, test_big)
static_assert(size == 32u);
bits.flip();
#if defined(_M_X64) || defined(_M_ARM64)
#if defined(_M_X64) || defined(_M_ARM64) || defined(__x86_64__)
static_assert(std::is_same_v<decltype(bits)::BlockType, uint64_t>);
static_assert(bits.data().size() == 4);
ASSERT_EQ(bits.data()[0], ~0uLL);