From 308e6aa8fe0e11d1ea970fa21ed024ffa06199f4 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 9 Jun 2019 11:14:31 -0400 Subject: [PATCH 1/5] Global env variables --- .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a00393b56..a18fd91ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,27 +38,27 @@ jobs: - stage: compile os: osx compiler: gcc - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Mac, CLANG - stage: compile os: osx compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, GCC - stage: compile os: linux compiler: gcc - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, CLANG - stage: compile os: linux compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, with deprecated ON to make sure that path still compiles - stage: compile os: linux compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # Matrix configuration: os: @@ -71,7 +71,9 @@ env: global: - MAKEFLAGS="-j 2" - CCACHE_SLOPPINESS=pch_defines,time_macros + - GTSAM_BUILD_UNSTABLE=ON + - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF matrix: - - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON - - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=ON GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + - GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + - GTSAM_BUILD_TESTS=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF From 7cee39f482dbca6caf9c088586467747d56bc626 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Mon, 10 Jun 2019 10:16:51 -0400 Subject: [PATCH 2/5] Always run in debug mode --- .travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.sh b/.travis.sh index 4b80d23a7..14eb9f455 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,6 +23,7 @@ function build_and_test () fi cmake $SOURCE_DIR \ + -DCMAKE_BUILD_TYPE=Debug \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS \ -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ From 96fe0474e601ee2502ac5e26499d2f14bbf6f370 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Mon, 10 Jun 2019 10:22:25 -0400 Subject: [PATCH 3/5] Removed redundant flags. Add commented out code to turn off clang on Linux. --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a18fd91ba..9d88f93ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,22 +38,22 @@ jobs: - stage: compile os: osx compiler: gcc - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Mac, CLANG - stage: compile os: osx compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, GCC - stage: compile os: linux compiler: gcc - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, CLANG - stage: compile os: linux compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF # on Linux, with deprecated ON to make sure that path still compiles - stage: compile os: linux @@ -69,7 +69,7 @@ compiler: - clang env: global: - - MAKEFLAGS="-j 2" + - MAKEFLAGS="-j2" - CCACHE_SLOPPINESS=pch_defines,time_macros - GTSAM_BUILD_UNSTABLE=ON - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF @@ -77,3 +77,8 @@ env: - GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON - GTSAM_BUILD_TESTS=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF +# Uncomment this if you want to exclude clang on linux +# matrix: +# exclude: +# - os: linux +# compiler: clang From 502bf7cc0440f285bebbef127943991c92eb0d14 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Mon, 10 Jun 2019 13:25:30 -0400 Subject: [PATCH 4/5] Test both Debug and Release --- .travis.sh | 2 +- .travis.yml | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.sh b/.travis.sh index 14eb9f455..b27ec81b0 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,7 +23,7 @@ function build_and_test () fi cmake $SOURCE_DIR \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS \ -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ diff --git a/.travis.yml b/.travis.yml index 9d88f93ae..ac59b5ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,27 +38,27 @@ jobs: - stage: compile os: osx compiler: gcc - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Mac, CLANG - stage: compile os: osx compiler: clang - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, GCC - stage: compile os: linux compiler: gcc - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, CLANG - stage: compile os: linux compiler: clang - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, with deprecated ON to make sure that path still compiles - stage: compile os: linux compiler: clang - env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # Matrix configuration: os: @@ -73,9 +73,11 @@ env: - CCACHE_SLOPPINESS=pch_defines,time_macros - GTSAM_BUILD_UNSTABLE=ON - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF + - GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + - GTSAM_BUILD_TESTS=ON matrix: - - GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON - - GTSAM_BUILD_TESTS=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF + - CMAKE_BUILD_TYPE=Debug + - CMAKE_BUILD_TYPE=release # Uncomment this if you want to exclude clang on linux # matrix: From 2ac505f35ef909acc19c0acd8d218ab2098c7a90 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Mon, 10 Jun 2019 14:04:21 -0400 Subject: [PATCH 5/5] Add Debug/Release in compile stage as well --- .travis.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac59b5ad9..d8d1c07b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,22 +38,38 @@ jobs: - stage: compile os: osx compiler: gcc - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + - stage: compile + os: osx + compiler: gcc + env: CMAKE_BUILD_TYPE=Release GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Mac, CLANG - stage: compile os: osx compiler: clang - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + - stage: compile + os: osx + compiler: clang + env: CMAKE_BUILD_TYPE=Release GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, GCC - stage: compile os: linux compiler: gcc - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + - stage: compile + os: linux + compiler: gcc + env: CMAKE_BUILD_TYPE=Release GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, CLANG - stage: compile os: linux compiler: clang - env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON + - stage: compile + os: linux + compiler: clang + env: CMAKE_BUILD_TYPE=Release GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON # on Linux, with deprecated ON to make sure that path still compiles - stage: compile os: linux @@ -77,7 +93,7 @@ env: - GTSAM_BUILD_TESTS=ON matrix: - CMAKE_BUILD_TYPE=Debug - - CMAKE_BUILD_TYPE=release + - CMAKE_BUILD_TYPE=Release # Uncomment this if you want to exclude clang on linux # matrix: