diff options
| author |   Richard Nespithal <richard@nespithal.com> | 2018-12-13 19:09:10 +0100 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-16 17:00:50 +0100 |
| commit | 95d33bd615f6c64a8c2fe7bf674738790b4a2289 (patch) | |
| tree | 734f42791677b82cd91d195c0ec7846bc08cea30 /games-simulation/openrct2/files | |
| parent | dev-python/django-cms: Remove last-rited pkg (diff) | |
| download | gentoo-95d33bd615f6c64a8c2fe7bf674738790b4a2289.tar.gz gentoo-95d33bd615f6c64a8c2fe7bf674738790b4a2289.tar.bz2 gentoo-95d33bd615f6c64a8c2fe7bf674738790b4a2289.zip | |
games-simulation/openrct2: Bump to 0.2.1, bug #669226
Closes: https://bugs.gentoo.org/669226
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Richard Nespithal <richard@nespithal.com>
Closes: https://github.com/gentoo/gentoo/pull/10633
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'games-simulation/openrct2/files')
| -rw-r--r-- | games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch new file mode 100644 index 000000000000..a4f1e2375321 --- /dev/null +++ b/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch @@ -0,0 +1,50 @@ +From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001 +From: "Hendrik v. Raven" <hendrik@consetetur.de> +Date: Sat, 4 Aug 2018 13:58:31 +0200 +Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option + +the option was removing when restructuring the CI system, but it is +still usefull for package maintainers. +--- + test/tests/CMakeLists.txt | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt +index 1f862153d..34ab5c884 100644 +--- a/test/tests/CMakeLists.txt ++++ b/test/tests/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 2.6) + ++option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.") + option(SYSTEM_GTEST "Use the googletest library provided by the system.") + + if (SYSTEM_GTEST) +@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp" + "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp") + add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES}) + target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z) +-add_test(NAME ride_ratings COMMAND test_ride_ratings) + + # Multi-launch test + set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp" + "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp") + add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES}) + target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z) +-add_test(NAME multilaunch COMMAND test_multilaunch) + + # Tile element test + set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp" + "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp") + add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES}) + target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z) +-add_test(NAME tile_elements COMMAND test_tile_elements) ++ ++if (NOT DISABLE_RCT2_TESTS) ++ add_test(NAME ride_ratings COMMAND test_ride_ratings) ++ add_test(NAME multilaunch COMMAND test_multilaunch) ++ add_test(NAME tile_elements COMMAND test_tile_elements) ++endif () +-- +2.18.0 + |