Fixup AutoLogFixture and tests that had transitive depends

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Mar 15, 2022 · 9e3a6fc · 9e3a6fc
1 parent 85654e4
commit 9e3a6fc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/events/src/Event_TEST.cc b/events/src/Event_TEST.cc
@@ -21,6 +21,7 @@
 
 #include <functional>
 #include <ignition/common/Event.hh>
+#include <ignition/common/Util.hh>
 
 using namespace ignition;
 

diff --git a/geospatial/src/CMakeLists.txt b/geospatial/src/CMakeLists.txt
@@ -19,4 +19,4 @@ target_include_directories(${geospatial_target}
     ${GDAL_INCLUDE_DIR})
 
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources}
-  LIB_DEPS ${geospatial_target})
+  LIB_DEPS ${geospatial_target} ignition-common${IGN_COMMON_VER}-testing)
diff --git a/test/integration/video_encoder.cc b/test/integration/video_encoder.cc
@@ -18,6 +18,7 @@
 // needed on MacOS
 #include <cmath>
 
+#include "ignition/common/Console.hh"
 #include "ignition/common/VideoEncoder.hh"
 #include "ignition/common/Video.hh"
 #include "ignition/common/ffmpeg_inc.hh"

diff --git a/testing/include/ignition/common/testing/AutoLogFixture.hh b/testing/include/ignition/common/testing/AutoLogFixture.hh
@@ -54,4 +54,6 @@ class AutoLogFixture : public ::testing::Test
 };
 }  // namespace ignition::common::testing
 
+#include <ignition/common/testing/detail/AutoLogFixture.hh>
+
 #endif  // IGNITION_COMMON_TESTING_AUTOLOGFIXTURE_HH_
diff --git a/testing/src/AutoLogFixture.cc → ...n/common/testing/detail/AutoLogFixture.hh b/testing/src/AutoLogFixture.cc → ...n/common/testing/detail/AutoLogFixture.hh
@@ -14,6 +14,8 @@
 * limitations under the License.
 *
 */
+#ifndef IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_
+#define IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_
 
 #include "ignition/common/testing/AutoLogFixture.hh"
 
@@ -66,7 +68,7 @@ void AutoLogFixture::SetUp()
   this->dataPtr->logFilename = testCaseName + "_" + testName + ".log";
 
   this->dataPtr->temp = std::make_unique<TempDirectory>(
-      "test", "ign_common", true);
+      "test", "ign_common", false);
   ASSERT_TRUE(this->dataPtr->temp->Valid());
   common::setenv(IGN_HOMEDIR, this->dataPtr->temp->Path());
 
@@ -104,3 +106,6 @@ std::string AutoLogFixture::LogContent() const
 }
 
 }  // namespace ignition::common::testing
+
+#endif  // IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_
+
diff --git a/testing/src/CMakeLists.txt b/testing/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(sources
-  AutoLogFixture.cc
   BazelTestPaths.cc
   CMakeTestPaths.cc
   TestPaths.cc