piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Externals: Convert gtest to a submodule and update to v1.12.1

Browse Source
This commit is contained in:
Pokechu22
2023-01-13 16:21:39 -08:00
parent d1aacf8547
commit 597f8f1b87
47 changed files with 9 additions and 34947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/UnitTests/UnitTests.vcxproj
View File

@ -19,7 +19,7 @@
<ItemDefinitionGroup>
<!--This project also compiles gtest-->
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)gtest\include;$(ExternalsDir)gtest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)gtest\googletest\include;$(ExternalsDir)gtest\googletest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup>
<!--gtest is rather small, so just include it into the build here-->
<ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
<ClCompile Include="$(ExternalsDir)gtest\googletest\src\gtest-all.cc" />
<!--Lump all of the tests (and supporting code) into one binary-->
<ClCompile Include="UnitTestsMain.cpp" />
<ClCompile Include="Common\BitFieldTest.cpp" />

6
Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
View File

@ -115,7 +115,7 @@ class VertexLoaderParamTest
std::tuple<VertexComponentFormat, ComponentFormat, CoordComponentCount, int>>
{
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AllCombinations, VertexLoaderParamTest,
::testing::Combine(
::testing::Values(VertexComponentFormat::Direct, VertexComponentFormat::Index8,
@ -259,7 +259,7 @@ class VertexLoaderSpeedTest : public VertexLoaderTest,
public ::testing::WithParamInterface<std::tuple<ComponentFormat, int>>
{
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
FormatsAndElements, VertexLoaderSpeedTest,
::testing::Combine(::testing::Values(ComponentFormat::UByte, ComponentFormat::Byte,
ComponentFormat::UShort, ComponentFormat::Short,
@ -537,7 +537,7 @@ class VertexLoaderNormalTest
std::tuple<VertexComponentFormat, ComponentFormat, NormalComponentCount, bool>>
{
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AllCombinations, VertexLoaderNormalTest,
::testing::Combine(
::testing::Values(VertexComponentFormat::NotPresent, VertexComponentFormat::Direct,