Update GoogleTest to latest version (#426)

* Remove old gtest version * Add new vendored Googletest version * Move test_config H to HH * CMake updates for new googletest version * Test updates for new googletest version * Remove unnecessary gtest_main functions Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jun 28, 2022 · 02cb9fd · 02cb9fd
1 parent b2e1be6
commit 02cb9fd
Show file tree

Hide file tree

Showing 80 changed files with 9,906 additions and 20,037 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,9 @@ find_package(gz-cmake3 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 gz_configure_project(
   REPLACE_IGNITION_INCLUDE_PATH gz/gui
   VERSION_SUFFIX pre1)

diff --git a/include/gz/gui/CMakeLists.txt b/include/gz/gui/CMakeLists.txt
@@ -49,7 +49,6 @@ gz_create_core_library(SOURCES
   ${sources}
   ${headers_MOC}
   ${resources_RCC}
-  CXX_STANDARD 17
 )
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}

diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc
@@ -20,7 +20,7 @@
 #include <gz/common/Console.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Dialog.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc
@@ -21,7 +21,7 @@
 #include <gz/common/MouseEvent.hh>
 #include <gz/math/Color.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Conversions.hh"
 
 using namespace gz;

diff --git a/src/DragDropModel_TEST.cc b/src/DragDropModel_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <gz/common/Console.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 
 #include "gz/gui/Enums.hh"
 #include "gz/gui/DragDropModel.hh"

diff --git a/src/GuiEvents_TEST.cc b/src/GuiEvents_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/GuiEvents.hh"
 
 using namespace gz;

diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc
@@ -21,7 +21,7 @@
 #include <gz/math/Helpers.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 #include "gz/gui/Helpers.hh"

diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc
@@ -27,7 +27,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 #include "gz/gui/Plugin.hh"

diff --git a/src/PlottingInterface_TEST.cc b/src/PlottingInterface_TEST.cc
@@ -27,7 +27,7 @@
 #include <gz/transport.hh>
 #include <gz/common/Console.hh>
 #include <gz/utils/ExtraTestMacros.hh>
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Enums.hh"
 #include "gz/gui/PlottingInterface.hh"
 

diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc
@@ -20,7 +20,7 @@
 #include <gz/common/Console.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 #include "gz/gui/Plugin.hh"

diff --git a/src/SearchModel_TEST.cc b/src/SearchModel_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <gz/common/Console.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 
 #include "gz/gui/Enums.hh"
 #include "gz/gui/SearchModel.hh"

diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc
@@ -25,7 +25,7 @@
 #include <gz/common/Util.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 
 #ifdef _MSC_VER
 #    define popen _popen

diff --git a/src/plugins/point_cloud/PointCloud_TEST.cc b/src/plugins/point_cloud/PointCloud_TEST.cc
@@ -22,7 +22,7 @@
 #include <gz/common/Filesystem.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 #include "gz/gui/Plugin.hh"

diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc
@@ -26,7 +26,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Plugin.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc
@@ -32,7 +32,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/GuiEvents.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc
@@ -21,7 +21,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Plugin.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc
@@ -26,7 +26,7 @@
 
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Plugin.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc
@@ -20,7 +20,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Plugin.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc
@@ -21,7 +21,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 #include "gz/gui/Plugin.hh"

diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc
@@ -21,7 +21,7 @@
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
-#include "test_config.h"  // NOLINT(build/include)
+#include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Application.hh"
 #include "gz/gui/Plugin.hh"
 #include "gz/gui/MainWindow.hh"

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,23 +1,11 @@
+configure_file (test_config.hh.in 
+  ${PROJECT_BINARY_DIR}/include/test_config.hh
+)
 include_directories (
-  ${PROJECT_SOURCE_DIR}/test/gtest/include
-  ${PROJECT_SOURCE_DIR}/test/gtest
-  ${PROJECT_SOURCE_DIR}/test
-  ${PROJECT_BINARY_DIR}
+  ${PROJECT_BINARY_DIR}/include
 )
 
-configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
-
-# Build gtest
-add_library(gtest STATIC gtest/src/gtest-all.cc)
-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
-set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
-set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
-
-execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
-execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
-include_directories(${GTEST_INCLUDE_DIRS})
-
+add_subdirectory(gtest_vendor)
 add_subdirectory(helpers)
 add_subdirectory(integration)
 add_subdirectory(performance)