Skip to content

Commit 7088e44

Browse files
committed
Add a new TESTS envvar to .travis.yml to disable gtest on Ubuntu Trusty 14.04
Recent googletest doesn't compile on this old Ubunty
1 parent bb051f9 commit 7088e44

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
- ASAN=ON
1515
- INTERNAL_SQLITE=ON
1616
- VALGRIND=OFF
17+
- TESTS=ON
1718

1819
# Build variants (should test a reasonable number of combination of CMake options)
1920
jobs:
@@ -69,6 +70,7 @@ jobs:
6970
- dist: trusty
7071
env:
7172
- cc=gcc cxx=g++
73+
- TESTS=OFF
7274

7375
##########################################################################
7476
# Clang on Linux
@@ -88,6 +90,7 @@ jobs:
8890
- dist: trusty
8991
env:
9092
- cc=clang cxx=clang++
93+
- TESTS=OFF
9194

9295
##########################################################################
9396
# Clang on OSX
@@ -121,13 +124,13 @@ before_install:
121124
before_script:
122125
- mkdir build
123126
- cd build
124-
- cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSQLITECPP_INTERNAL_SQLITE=$INTERNAL_SQLITE -DSQLITECPP_USE_ASAN=$ASAN -DSQLITECPP_USE_GCOV=$GCOV -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
127+
- cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSQLITECPP_INTERNAL_SQLITE=$INTERNAL_SQLITE -DSQLITECPP_USE_ASAN=$ASAN -DSQLITECPP_USE_GCOV=$GCOV -DSQLITECPP_BUILD_EXAMPLES=$TESTS -DSQLITECPP_BUILD_TESTS=$TESTS ..
125128

126129
# build examples, and run tests (ie make & make test)
127130
script:
128131
- cmake --build .
129132
- export ASAN_OPTIONS=verbosity=1:debug=1
130-
- ctest --verbose --output-on-failure
133+
- if [[ "$TESTS" == "ON" ]]; then ctest --verbose --output-on-failure ; fi
131134
- if [[ "$VALGRIND" == "ON" ]]; then valgrind --leak-check=full --error-exitcode=1 bin/SQLiteCpp_example1 ; fi
132135
- if [[ "$VALGRIND" == "ON" ]]; then valgrind --leak-check=full --error-exitcode=1 bin/SQLiteCpp_tests ; fi
133136

0 commit comments

Comments
 (0)