mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00
Code Issues Releases Wiki Activity

Update GoogleTest version

Browse Source
This commit is contained in:
Michał Janiszewski
2022-01-02 22:37:39 +01:00
parent b08c87c0c4
commit d81b36e16f
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/tests/CMakeLists.txt
View File

@@ -13,11 +13,10 @@ else (SYSTEM_GTEST)
# Bootstrap GoogleTest # Bootstrap GoogleTest
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
# Use googletest with https://github.com/google/googletest/pull/1045 applied
ExternalProject_Add( ExternalProject_Add(
googletest-distribution googletest-distribution
URL https://github.com/google/googletest/archive/ad49eaa0466b98f21449efaaaae817683daa8b99.tar.gz URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz # v1.11.0 release
URL_HASH SHA1=e468bfdffe7c46c14ce06bfb48a29b6201908504 URL_HASH SHA1=b0399e38211cc4fedd612f71bad7984ed4cbe8fe
TIMEOUT 10 TIMEOUT 10
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
@@ -32,10 +31,10 @@ else (SYSTEM_GTEST)
googletest googletest
DEPENDS googletest-distribution DEPENDS googletest-distribution
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest" SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}"
CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M}" CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M} -DBUILD_GMOCK=off"
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}" BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}" BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
# Disable install step # Disable install step
INSTALL_COMMAND "" INSTALL_COMMAND ""
# Wrap download, configure and build steps in a script to log output # Wrap download, configure and build steps in a script to log output
@@ -49,7 +48,7 @@ else (SYSTEM_GTEST)
# Library # Library
ExternalProject_Get_Property(googletest BINARY_DIR) ExternalProject_Get_Property(googletest BINARY_DIR)
set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}") set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}/lib")
set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}) set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}) set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
set(GTEST_LIBRARY gtest) set(GTEST_LIBRARY gtest)

4
test/tests/Pathfinding.cpp
View File

@@ -211,7 +211,7 @@ TEST_P(SimplePathfindingTest, CanFindPathFromStartToGoal)
EXPECT_TRUE(succeeded); EXPECT_TRUE(succeeded);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ForScenario, SimplePathfindingTest, ForScenario, SimplePathfindingTest,
::testing::Values( ::testing::Values(
SimplePathfindingScenario("StraightFlat", { 19, 15, 14 }, 24), SimplePathfindingScenario("SBend", { 15, 12, 14 }, 87), SimplePathfindingScenario("StraightFlat", { 19, 15, 14 }, 24), SimplePathfindingScenario("SBend", { 15, 12, 14 }, 87),
@@ -244,7 +244,7 @@ TEST_P(ImpossiblePathfindingTest, CannotFindPathFromStartToGoal)
EXPECT_FALSE(FindPath(&pos, goal, 10000, ride->id)); EXPECT_FALSE(FindPath(&pos, goal, 10000, ride->id));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ForScenario, ImpossiblePathfindingTest, ForScenario, ImpossiblePathfindingTest,
::testing::Values( ::testing::Values(
SimplePathfindingScenario("PathWithGap", { 1, 6, 14 }, 10000), SimplePathfindingScenario("PathWithGap", { 1, 6, 14 }, 10000),

2
test/tests/ReplayTests.cpp
View File

@@ -115,4 +115,4 @@ struct PrintReplayParameter
} }
}; };
INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter()); INSTANTIATE_TEST_SUITE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());

2
test/tests/StringTest.cpp
View File

@@ -27,7 +27,7 @@ class StringTest : public testing::TestWithParam<TCase>
// Tests for String::Trim // Tests for String::Trim
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TrimData, StringTest, TrimData, StringTest,
testing::Values( testing::Values(
// input after Trim after TrimStart // input after Trim after TrimStart