mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 14:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 947bdea590 into 879a8889aa

Browse source
This commit is contained in:
Tygyh 2025-04-23 17:07:33 -05:00 • committed by GitHub
commit 687a7350d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/UnitTests/Common/BitFieldTest.cpp
View file

@ -494,7 +494,7 @@ union TestUnion5
TEST(BitFieldArray, StorageType) TEST(BitFieldArray, StorageType)
{ {
TestUnion5 object; TestUnion5 object;
const u64 arr2_hex_1 = 0b1010ull << 30; constexpr u64 arr2_hex_1 = 0b1010ull << 30;
object.hex = arr2_hex_1; object.hex = arr2_hex_1;
const TestUnion5& objectc = object; const TestUnion5& objectc = object;
@ -509,17 +509,17 @@ TEST(BitFieldArray, StorageType)
object.arr1[3] = 4; object.arr1[3] = 4;
object.arr1[4] = 8; object.arr1[4] = 8;
object.arr1[5] = 16; object.arr1[5] = 16;
const u64 arr1_hex = 0b10000'01000'00100'00010'00001'00000; constexpr u64 arr1_hex = 0b10000'01000'00100'00010'00001'00000;
EXPECT_EQ(object.hex, arr1_hex | arr2_hex_1); EXPECT_EQ(object.hex, arr1_hex | arr2_hex_1);
object.arr2[2] = object.arr2[0] = true; object.arr2[2] = object.arr2[0] = true;
object.arr2[3] = object.arr2[1] = false; object.arr2[3] = object.arr2[1] = false;
const u64 arr2_hex_2 = 0b0101ull << 30; constexpr u64 arr2_hex_2 = 0b0101ull << 30;
EXPECT_EQ(object.hex, arr1_hex | arr2_hex_2); EXPECT_EQ(object.hex, arr1_hex | arr2_hex_2);
object.arr2[2] = object.arr2[1]; object.arr2[2] = object.arr2[1];
object.arr2[3] = objectc.arr2[0]; object.arr2[3] = objectc.arr2[0];
const u64 arr2_hex_3 = 0b1001ull << 30; constexpr u64 arr2_hex_3 = 0b1001ull << 30;
EXPECT_EQ(object.hex, arr1_hex | arr2_hex_3); EXPECT_EQ(object.hex, arr1_hex | arr2_hex_3);
u32 counter = 0; u32 counter = 0;

2
Source/UnitTests/Common/Crypto/SHA1Test.cpp
View file

@ -9,7 +9,7 @@ TEST(SHA1, Vectors)
{ {
const char* msg; const char* msg;
const Common::SHA1::Digest expected; const Common::SHA1::Digest expected;
} const vectors[]{ } constexpr vectors[]{
{"", {0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55, {"", {0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55,
0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09}}, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09}},
{"abc", {0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e, {"abc", {0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e,

2
Source/UnitTests/Common/EventTest.cpp
View file

@ -12,7 +12,7 @@ TEST(Event, MultiThreaded)
{ {
Event has_sent, can_send; Event has_sent, can_send;
int shared_obj; int shared_obj;
const int ITERATIONS_COUNT = 100000; constexpr int ITERATIONS_COUNT = 100000;
auto sender = [&]() { auto sender = [&]() {
for (int i = 0; i < ITERATIONS_COUNT; ++i) for (int i = 0; i < ITERATIONS_COUNT; ++i)

6
Source/UnitTests/Common/FlagTest.cpp
View file

@ -34,7 +34,7 @@ TEST(Flag, MultiThreaded)
{ {
Flag f; Flag f;
int count = 0; int count = 0;
const int ITERATIONS_COUNT = 100000; constexpr int ITERATIONS_COUNT = 100000;
auto setter = [&]() { auto setter = [&]() {
for (int i = 0; i < ITERATIONS_COUNT; ++i) for (int i = 0; i < ITERATIONS_COUNT; ++i)
@ -69,8 +69,8 @@ TEST(Flag, SpinLock)
// Uses a flag to implement basic spinlocking using TestAndSet. // Uses a flag to implement basic spinlocking using TestAndSet.
Flag f; Flag f;
int count = 0; int count = 0;
const int ITERATIONS_COUNT = 5000; constexpr int ITERATIONS_COUNT = 5000;
const int THREADS_COUNT = 50; constexpr int THREADS_COUNT = 50;
auto adder_func = [&]() { auto adder_func = [&]() {
for (int i = 0; i < ITERATIONS_COUNT; ++i) for (int i = 0; i < ITERATIONS_COUNT; ++i)

4
Source/UnitTests/Core/IOS/ES/FormatsTest.cpp
View file

@ -14,11 +14,11 @@ TEST(ESFormats, TitleType)
EXPECT_TRUE(IOS::ES::IsTitleType(Titles::SYSTEM_MENU, IOS::ES::TitleType::System)); EXPECT_TRUE(IOS::ES::IsTitleType(Titles::SYSTEM_MENU, IOS::ES::TitleType::System));
EXPECT_FALSE(IOS::ES::IsDiscTitle(Titles::SYSTEM_MENU)); EXPECT_FALSE(IOS::ES::IsDiscTitle(Titles::SYSTEM_MENU));
const u64 ios59_title_id = 0x000000010000003b; constexpr u64 ios59_title_id = 0x000000010000003b;
EXPECT_TRUE(IOS::ES::IsTitleType(ios59_title_id, IOS::ES::TitleType::System)); EXPECT_TRUE(IOS::ES::IsTitleType(ios59_title_id, IOS::ES::TitleType::System));
EXPECT_FALSE(IOS::ES::IsDiscTitle(ios59_title_id)); EXPECT_FALSE(IOS::ES::IsDiscTitle(ios59_title_id));
const u64 ztp_title_id = 0x00010000525a4445; constexpr u64 ztp_title_id = 0x00010000525a4445;
EXPECT_TRUE(IOS::ES::IsTitleType(ztp_title_id, IOS::ES::TitleType::Game)); EXPECT_TRUE(IOS::ES::IsTitleType(ztp_title_id, IOS::ES::TitleType::Game));
EXPECT_TRUE(IOS::ES::IsDiscTitle(ztp_title_id)); EXPECT_TRUE(IOS::ES::IsDiscTitle(ztp_title_id));
} }

10
Source/UnitTests/Core/IOS/USB/SkylandersTest.cpp
View file

@ -130,11 +130,11 @@ TEST(Skylanders, Keygen)
std::array<u8, 4> nuid; std::array<u8, 4> nuid;
u8 sector; u8 sector;
u64 expected; u64 expected;
} const inputs[]{{{0x00, 0x00, 0x00, 0x00}, 0, 0x4B0B20107CCB}, } constexpr inputs[]{{{0x00, 0x00, 0x00, 0x00}, 0, 0x4B0B20107CCB},
{{0x94, 0xB0, 0xEE, 0x2D}, 0, 0x4B0B20107CCB}, {{0x94, 0xB0, 0xEE, 0x2D}, 0, 0x4B0B20107CCB},
{{0x00, 0x00, 0x00, 0x00}, 11, 0xEA168579FF28}, {{0x00, 0x00, 0x00, 0x00}, 11, 0xEA168579FF28},
{{0x94, 0xB0, 0xEE, 0x2D}, 1, 0x278e4DA896B5}, {{0x94, 0xB0, 0xEE, 0x2D}, 1, 0x278e4DA896B5},
{{0xF7, 0xDB, 0xFD, 0x5F}, 2, 0x75B9B1F4B9EB}}; {{0xF7, 0xDB, 0xFD, 0x5F}, 2, 0x75B9B1F4B9EB}};
for (auto& test : inputs) for (auto& test : inputs)
{ {