From b08a2a6c4f84fa199145abcd8cefc412f9f64456 Mon Sep 17 00:00:00 2001
From: Michael Carroll <michael@openrobotics.org>
Date: Tue, 19 May 2020 08:25:35 -0500
Subject: [PATCH] Disable long running buildsystem tests by default

Signed-off-by: Michael Carroll <michael@openrobotics.org>
---
 .github/workflows/ci-bionic.yml | 16 +++++++++++++++-
 CMakeLists.txt                  |  6 ++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml
index 2669ae0c..36818a59 100644
--- a/.github/workflows/ci-bionic.yml
+++ b/.github/workflows/ci-bionic.yml
@@ -11,6 +11,20 @@ jobs:
         uses: actions/checkout@v2
       - name: Bionic CI
         id: ci
-        uses: ignition-tooling/ubuntu-bionic-ci-action@master
+        uses: ignition-tooling/ubuntu-bionic-ci-action@cmake_args
         with:
           apt-dependencies: 'pkg-config'
+  bionic-ci-plus:
+    runs-on: ubuntu-latest
+    name: Ubuntu Bionic CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Bionic CI
+        id: ci
+        uses: ignition-tooling/ubuntu-bionic-ci-action@cmake_args
+        with:
+          apt-dependencies: 'pkg-config'
+          cmake-args: '-DBUILDSYSTEM_TESTING=True'
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61219651..004b8f59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
@@ -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
   #============================================================================