Skip to content

Commit

Permalink
Remove logic for skipping tests with old cmake
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Peters <[email protected]>
  • Loading branch information
scpeters committed May 29, 2024
1 parent 274ab82 commit edd5a06
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
27 changes: 0 additions & 27 deletions test/integration/examples_build.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,6 @@ struct ExampleEntry
}
};

//////////////////////////////////////////////////
/// Filter examples that are known to not build or require
/// specific configurations
/// \param[in] _entry Example entry to check
/// \return true if example entry should be built, false otherwise
bool FilterEntry(const ExampleEntry &_entry)
{
math::SemanticVersion cmakeVersion{std::string(CMAKE_VERSION)};
if (cmakeVersion < math::SemanticVersion(3, 11, 0) &&
(_entry.base == "custom_sensor_system" ||
_entry.base == "gtest_setup"))
{
gzdbg << "Skipping [" << _entry.base
<< "] test, which requires CMake version "
<< ">= 3.11.0. Currently using CMake "
<< cmakeVersion
<< std::endl;
return false;
}
return true;
}

//////////////////////////////////////////////////
/// Generate a list of examples to be built.
std::vector<ExampleEntry> GetExamples()
Expand Down Expand Up @@ -116,11 +94,6 @@ void ExamplesBuild::Build(const ExampleEntry &_entry)
{
common::Console::SetVerbosity(4);

if (!FilterEntry(_entry))
{
GTEST_SKIP();
}

// Path to examples of the given type
ASSERT_TRUE(gz::common::exists(_entry.sourceDir));

Expand Down
1 change: 0 additions & 1 deletion test/test_config.hh.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}"
#define PROJECT_BINARY_PATH "${CMAKE_BINARY_DIR}"
#define CMAKE_VERSION "${CMAKE_VERSION}"

#define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf"

Expand Down

0 comments on commit edd5a06

Please sign in to comment.