-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
684 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,18 @@ | ||
| --- | ||
| sources: | ||
| 2.37.4: | ||
| url: | ||
| - https://github.com/esmini/esmini/archive/refs/tags/v2.37.4.tar.gz | ||
| sha256: "6d765db38bc3769a867555f108c25b0d62029780d41784e429822ed35776bfc6" | ||
| 2.37.0: | ||
| url: | ||
| - https://github.com/esmini/esmini/archive/refs/tags/v2.37.0.tar.gz | ||
| sha256: "a1f216411caa7d8782dd9c82683f8bac3f00d7da2f6370535726b6446c339e59" | ||
| patches: | ||
| 2.37.0: | ||
| 2.37.x: &esmini-2_37_x-patches | ||
| - patch_file: patches/2.37.0-test-driver-path.patch | ||
| patch_type: git | ||
| patch_description: > | ||
| Patch paths to reflect new position of test-driver.xosc. | ||
| 2.37.4: *esmini-2_37_x-patches | ||
| 2.37.0: *esmini-2_37_x-patches |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index aec4cf5..46089bf 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1,18 +1,9 @@ | ||
| +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) | ||
| + | ||
| message( | ||
| STATUS "CMake version: " | ||
| ${CMAKE_VERSION}) | ||
|
|
||
| -if(WIN32) | ||
| - cmake_minimum_required( | ||
| - VERSION 3.7.1 # for cmake generator VisualStudio 2017 support | ||
| - # VERSION 3.14 # for cmake generator VisualStudio 2019 support VERSION 3.19 # for cmake presets support | ||
| - FATAL_ERROR) | ||
| -else() | ||
| - cmake_minimum_required( | ||
| - VERSION 2.8.12 | ||
| - FATAL_ERROR) | ||
| -endif() | ||
| - | ||
| # ############################# Project generate options ########################################################### | ||
|
|
||
| project( | ||
| @@ -98,6 +89,8 @@ set_property( | ||
| PROPERTY USE_FOLDERS | ||
| ON) | ||
|
|
||
| +include(CTest) | ||
| + | ||
| include(support/cmake/rule/project_options.cmake) | ||
|
|
||
| if(${CMAKE_SYSTEM_NAME} | ||
| diff --git a/support/cmake/common/unittest.cmake b/support/cmake/common/unittest.cmake | ||
| index 2df5b8a..edb9efe 100644 | ||
| --- a/support/cmake/common/unittest.cmake | ||
| +++ b/support/cmake/common/unittest.cmake | ||
| @@ -2,6 +2,9 @@ include_guard() | ||
|
|
||
| # ############################### Building given unittest target ################################################### | ||
|
|
||
| +include(CTest) | ||
| +include(GoogleTest) | ||
| + | ||
| macro( | ||
| unittest | ||
| TARGET | ||
| @@ -55,5 +58,6 @@ macro( | ||
| add_test( | ||
| NAME ${TARGET} | ||
| COMMAND ${TARGET}) | ||
| + gtest_add_tests(TARGET ${TARGET}) | ||
|
|
||
| endmacro() |
96 changes: 96 additions & 0 deletions
96
vendor/esmini/patches/2.37.4_disable_unittests_for_container.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| diff --git a/EnvironmentSimulator/Unittest/CMakeLists.txt b/EnvironmentSimulator/Unittest/CMakeLists.txt | ||
| index f9764c9..866c63a 100644 | ||
| --- a/EnvironmentSimulator/Unittest/CMakeLists.txt | ||
| +++ b/EnvironmentSimulator/Unittest/CMakeLists.txt | ||
| @@ -38,19 +38,20 @@ unittest( | ||
|
|
||
| # ############################### Creating executable (ScenarioPlayer_test) ########################################## | ||
|
|
||
| -unittest( | ||
| - ScenarioPlayer_test | ||
| - ScenarioPlayer_test.cpp | ||
| - PlayerBase | ||
| - ScenarioEngine | ||
| - Controllers | ||
| - RoadManager | ||
| - CommonMini | ||
| - ${VIEWER_LIBS_FOR_TEST} | ||
| - ${OSG_LIBRARIES} | ||
| - ${OSI_LIBRARIES} | ||
| - ${SUMO_LIBRARIES} | ||
| - ${SOCK_LIB}) | ||
| +# DISABLED: Fails in container. | ||
| +# unittest( | ||
| +# ScenarioPlayer_test | ||
| +# ScenarioPlayer_test.cpp | ||
| +# PlayerBase | ||
| +# ScenarioEngine | ||
| +# Controllers | ||
| +# RoadManager | ||
| +# CommonMini | ||
| +# ${VIEWER_LIBS_FOR_TEST} | ||
| +# ${OSG_LIBRARIES} | ||
| +# ${OSI_LIBRARIES} | ||
| +# ${SUMO_LIBRARIES} | ||
| +# ${SOCK_LIB}) | ||
|
|
||
| # ############################### Creating executable (ScenarioEngineDll_test) ####################################### | ||
|
|
||
| @@ -58,12 +59,13 @@ set(ScenarioEngineDll_sources | ||
| ScenarioEngineDll_test.cpp | ||
| "${REPLAYER_PATH}/Replay.cpp") | ||
|
|
||
| -unittest( | ||
| - ScenarioEngineDll_test | ||
| - "${ScenarioEngineDll_sources}" | ||
| - esminiLib | ||
| - CommonMini | ||
| - ${OSI_LIBRARIES}) | ||
| +# DISABLED: Fails in container. | ||
| +# unittest( | ||
| +# ScenarioEngineDll_test | ||
| +# "${ScenarioEngineDll_sources}" | ||
| +# esminiLib | ||
| +# CommonMini | ||
| +# ${OSI_LIBRARIES}) | ||
|
|
||
| # ############################### Creating executable (RoadManagerDll_test) ########################################## | ||
|
|
||
| diff --git a/EnvironmentSimulator/Unittest/ScenarioEngineDll_test.cpp b/EnvironmentSimulator/Unittest/ScenarioEngineDll_test.cpp | ||
| index 65a0e52..24523f8 100644 | ||
| --- a/EnvironmentSimulator/Unittest/ScenarioEngineDll_test.cpp | ||
| +++ b/EnvironmentSimulator/Unittest/ScenarioEngineDll_test.cpp | ||
| @@ -3585,7 +3585,7 @@ static bool CheckFileExists(std::string filename, long long timestamp) | ||
| return false; | ||
| } | ||
|
|
||
| -TEST(APITest, TestFetchImage) | ||
| +TEST(APITest, DIABLED_TestFetchImage) | ||
| { | ||
| struct stat fileStatus; | ||
| long long oldModTime = 0; | ||
| diff --git a/EnvironmentSimulator/Unittest/ScenarioPlayer_test.cpp b/EnvironmentSimulator/Unittest/ScenarioPlayer_test.cpp | ||
| index 4d9a6d2..e21c4e8 100644 | ||
| --- a/EnvironmentSimulator/Unittest/ScenarioPlayer_test.cpp | ||
| +++ b/EnvironmentSimulator/Unittest/ScenarioPlayer_test.cpp | ||
| @@ -11,7 +11,7 @@ using namespace scenarioengine; | ||
|
|
||
| #ifdef _USE_OSG | ||
|
|
||
| -TEST(CustomCameraTest, TestCustomCameraVariants) | ||
| +TEST(CustomCameraTest, DISABLED_TestCustomCameraVariants) | ||
| { | ||
| const char* args[] = | ||
| {"esmini", "--osc", "../../../resources/xosc/cut-in_cr.xosc", "--window", "60", "60", "800", "600", "--headless", "--disable_stdout"}; | ||
| @@ -368,11 +368,6 @@ TEST(Controllers, TestSeparateControllersOnLatLong) | ||
| const char* args[] = {"esmini", | ||
| "--osc", | ||
| "../../../EnvironmentSimulator/Unittest/xosc/acc_with_interactive_steering.xosc", | ||
| - "--window", | ||
| - "60", | ||
| - "60", | ||
| - "800", | ||
| - "600", | ||
| "--headless", | ||
| "--disable_stdout"}; | ||
| int argc = sizeof(args) / sizeof(char*); |
Oops, something went wrong.