Skip to content

Commit

Permalink
Disable long-running buildsystem tests by default (#97) (#100)
Browse files Browse the repository at this point in the history
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
  • Loading branch information
3 people authored Jun 5, 2020
1 parent f033612 commit 961254e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-bionic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ jobs:
uses: ignition-tooling/ubuntu-bionic-ci-action@master
with:
apt-dependencies: 'pkg-config'
cmake-args: '-DBUILDSYSTEM_TESTING=True'
codecov-token: ${{ secrets.CODECOV_TOKEN }}
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ include(IgnCMake)
# Set up the project
ign_configure_project()

#--------------------------------------
# Set project-specific options
option(BUILDSYSTEM_TESTING "Enable extended buildsystem testing" FALSE)

#--------------------------------------
# Install the ignition documentation files
# Note: This is not actually creating a doc target for ign-cmake; this is just
Expand Down Expand Up @@ -148,7 +152,9 @@ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
include(CTest)
if (BUILD_TESTING)
add_subdirectory(test)
endif()

if (BUILD_TESTING AND BUILDSYSTEM_TESTING)
#============================================================================
# Build examples
#============================================================================
Expand Down
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Ignition CMake 2.x

### Ignition CMake 2.2.x

1. Disable long-running buildsystem tests by default.
* [Pull request 97](https://github.com/ignitionrobotics/ign-cmake/pull/97)

### Ignition CMake 2.2.0

1. Fix use of FindZIP without pkg-config.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ Documentation for `ignition-cmake` can be found within the source code, and also

# Testing

A fuller suite of tests in the `examples` directory can be enabled by building with `BUILDSYSTEM_TESTING` enabled.
Tests can be run by building the `test` target. From your build directory you can run:

```
$ cmake .. -DBUILDSYSTEM_TESTING=1
$ make test
```

Expand Down

0 comments on commit 961254e

Please sign in to comment.