Fix test config generation

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Dec 7, 2023 · 9170736 · 9170736
1 parent 2078bdc
commit 9170736
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 21 deletions.
diff --git a/log/src/CMakeLists.txt b/log/src/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 gz_build_tests(
   TYPE "UNIT"
   SOURCES ${gtest_sources}
-  LIB_DEPS ${log_lib_target} ${EXTRA_TEST_LIB_DEPS}
+  LIB_DEPS ${log_lib_target} ${EXTRA_TEST_LIB_DEPS} test_config
   TEST_LIST logging_tests
 )
 

diff --git a/log/src/Log_TEST.cc b/log/src/Log_TEST.cc
@@ -255,17 +255,7 @@ TEST(Log, NullDescriptorUnopenedLog)
 TEST(Log, OpenCorruptDatabase)
 {
   log::Log logFile;
-<<<<<<< HEAD
-  std::string path =
-    testing::portablePathUnion(GZ_TRANSPORT_LOG_TEST_PATH, "data");
-  path = testing::portablePathUnion(path, "state.tlog");
-
-  std::cout << path << std::endl;
-
-  logFile.Open(path);
-=======
   logFile.Open(kCorruptDbTestPath);
->>>>>>> gz-transport12
   EXPECT_GT(logFile.EndTime(), 0ns) << "logFile.EndTime() == "
     << logFile.EndTime().count() << "ns";;
 }
diff --git a/log/test/integration/CMakeLists.txt b/log/test/integration/CMakeLists.txt
@@ -20,6 +20,7 @@ gz_build_tests(
     ChirpParams
     ${PROJECT_LIBRARY_TARGET_NAME}-log
     ${EXTRA_TEST_LIB_DEPS}
+    test_config
   INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/test/
 )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 # Build the unit tests.
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}
   TEST_LIST test_list
-  LIB_DEPS ${EXTRA_TEST_LIB_DEPS})
+  LIB_DEPS ${EXTRA_TEST_LIB_DEPS} test_config)
 
 foreach(test ${test_list})
 

diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc
@@ -29,6 +29,7 @@
 #include <thread>
 
 #include "gz/transport/MessageInfo.hh"
+#include "gz/transport/Node.hh"
 #include "gz/transport/TransportTypes.hh"
 
 #include <gz/utils/Environment.hh>

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
@@ -41,11 +41,12 @@ install(TARGETS ${service_executable} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gz
 # Build the unit tests.
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}
   TEST_LIST test_list
-  LIB_DEPS ${EXTRA_TEST_LIB_DEPS})
+  LIB_DEPS
+    gz
+    gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
+    ${EXTRA_TEST_LIB_DEPS} test_config)
 
 foreach(test ${test_list})
-  target_link_libraries(${test} gz gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER})
-
   # Inform each test of its output directory so it knows where to call the
   # auxiliary files from. Using a generator expression here is useful for
   # multi-configuration generators, like Visual Studio.

diff --git a/src/cmd/gz_TEST.cc b/src/cmd/gz_TEST.cc
@@ -30,6 +30,8 @@
 #include "gtest/gtest.h"
 #include "gz/transport/Node.hh"
 
+#include "test_config.hh"
+
 using namespace gz;
 
 static std::string g_partition; // NOLINT(*)

diff --git a/src/cmd/gz_src_TEST.cc b/src/cmd/gz_src_TEST.cc
@@ -28,6 +28,8 @@
 
 #include <gz/utils/Environment.hh>
 
+#include "test_utils.hh"
+
 using namespace gz;
 
 // Global constants.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,9 +1,11 @@
-configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/test_config.hh)
-include_directories (
-  ${PROJECT_BINARY_DIR}/include
-)
-
 add_subdirectory(gtest_vendor)
 add_subdirectory(integration)
 add_subdirectory(performance)
 add_subdirectory(regression)
+
+configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/test_config.hh)
+add_library(test_config INTERFACE)
+target_include_directories(test_config INTERFACE
+  ${PROJECT_BINARY_DIR}/include
+  ${PROJECT_SOURCE_DIR}/test
+)
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 
 gz_build_tests(TYPE INTEGRATION SOURCES ${tests}
   TEST_LIST test_list
-  LIB_DEPS ${EXTRA_TEST_LIB_DEPS})
+  LIB_DEPS ${EXTRA_TEST_LIB_DEPS} test_config)
 
 set(auxiliary_files
   authPubSubSubscriberInvalid_aux
@@ -54,6 +54,7 @@ foreach(AUX_EXECUTABLE ${auxiliary_files})
       ${PROJECT_LIBRARY_TARGET_NAME}
       gtest
       ${EXTRA_TEST_LIB_DEPS}
+      test_config
   )
 endforeach(AUX_EXECUTABLE)
 

diff --git a/test/test_config.hh.in b/test/test_config.hh.in
@@ -22,4 +22,6 @@
 #define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf"
 #define GZ_VERSION_FULL "@PROJECT_VERSION_FULL@"
 
+#include "test_utils.hh"
+
 #endif  // GZ_TRANSPORT_TEST_CONFIG_HH_