From 5db75623f3be8808169d3cada1a82ec26ed8733b Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 2 Jun 2019 10:02:05 -0400
Subject: [PATCH] Use more direct configuration of cmake, disable unstable for
 gcc tests

---
 .travis.sh  | 15 ++-------------
 .travis.yml | 29 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 522d82353..209b08ee0 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -22,19 +22,8 @@ function build_and_test ()
     sudo update-alternatives --set gcc /usr/bin/gcc-$GCC_VERSION
   fi
 
-  # gcc is too slow and we have a time limit in Travis CI: selective builds.
-  if [ "$BUILD_EXAMPLES" == "1" ]; then
-    GTSAM_BUILD_EXAMPLES_ALWAYS=ON
-  else
-    GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
-  fi
-  if [ "$RUN_TESTS" == "1" ]; then
-    GTSAM_BUILD_TESTS=ON
-  else
-    GTSAM_BUILD_TESTS=OFF
-  fi
-
   cmake $SOURCE_DIR \
+      -GTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \
       -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \
       -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS
 
@@ -42,7 +31,7 @@ function build_and_test ()
   make -j2
 
   # Run tests:
-  if [ "$RUN_TESTS" == "1" ]; then
+  if [ "$GTSAM_BUILD_TESTS" == "ON" ]; then
     make check
   fi
 
diff --git a/.travis.yml b/.travis.yml
index bce676721..857c6469f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,23 +27,24 @@ env:
     - MAKEFLAGS="-j 2"
     - CCACHE_SLOPPINESS=pch_defines,time_macros
 
+# gcc is too slow and we have a time limit in Travis CI: selective builds.
 matrix:
   include:
   - compiler: gcc
     os: linux
-    env: BUILD_EXAMPLES=1
+    env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF
   - compiler: gcc
     os: linux
-    env: RUN_TESTS=1
-  - compiler: gcc
-    os: linux
-    env: BUILD_EXAMPLES=1 GCC_VERSION="8"
-  - compiler: clang
-    os: linux
-    env: BUILD_EXAMPLES=1
-  - compiler: gcc
-    os: osx
-    env: BUILD_EXAMPLES=1
-  - compiler: clang
-    os: osx
-    env: RUN_TESTS=1
+    env: GTSAM_BUILD_UNSTABLE=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON # gcc too slow for all tests
+  # - compiler: gcc
+  #   os: linux
+  #   env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF GCC_VERSION="8"
+  # - compiler: clang
+  #   os: linux
+  #   env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF
+  # - compiler: gcc
+  #   os: osx
+  #   env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF
+  # - compiler: clang
+  #   os: osx
+  #   env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON