@@ -123,9 +123,16 @@ jobs:
123123 - g++-5
124124 - libubsan0
125125 before_install :
126+ - |
127+ if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]
128+ then
129+ echo "This is not a cron build and build is not needed."
130+ travis_terminate 0
131+ fi
126132 - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
127133 # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
128134 env :
135+ - NAME="DEBUG"
129136 - COMPILER="ccache /usr/bin/g++-5"
130137 - EXTRA_CXXFLAGS="-DDEBUG"
131138 script : echo "Not running any tests for a debug build."
@@ -156,7 +163,7 @@ jobs:
156163 - EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DNDEBUG"
157164 - CCACHE_CPP2=yes
158165
159- # Ubuntu Linux with glibc using clang++-3.7, debug mode, disable USE_DSTRING
166+ # Ubuntu Linux with glibc using clang++-3.7, debug mode
160167 - stage : Test different OS/CXX/Flags
161168 os : linux
162169 sudo : false
@@ -173,12 +180,19 @@ jobs:
173180 - libstdc++-5-dev
174181 - libubsan0
175182 before_install :
183+ - |
184+ if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]
185+ then
186+ echo "This is not a cron build and build is not needed."
187+ travis_terminate 0
188+ fi
176189 - mkdir bin ; ln -s /usr/bin/clang-3.7 bin/gcc
177190 - export CCACHE_CPP2=yes
178191 # env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
179192 env :
193+ - NAME="DEBUG"
180194 - COMPILER="ccache /usr/bin/clang++-3.7"
181- - EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DDEBUG -DUSE_STD_STRING "
195+ - EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DDEBUG"
182196 - CCACHE_CPP2=yes
183197 script : echo "Not running any tests for a debug build."
184198
@@ -221,6 +235,34 @@ jobs:
221235 - cmake --build build -- -j4
222236 script : (cd build; ctest -V -L CORE -j2)
223237
238+ # Ubuntu Linux with glibc using g++-5, disable USE_DSTRING
239+ - stage : Test different OS/CXX/Flags
240+ os : linux
241+ sudo : false
242+ compiler : gcc
243+ cache : ccache
244+ addons :
245+ apt :
246+ sources :
247+ - ubuntu-toolchain-r-test
248+ packages :
249+ - libwww-perl
250+ - g++-5
251+ - libubsan0
252+ - parallel
253+ before_install :
254+ - |
255+ if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]
256+ then
257+ echo "This is not a cron build and build is not needed."
258+ travis_terminate 0
259+ fi
260+ - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
261+ # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
262+ env :
263+ - NAME="USE_STD_STRING"
264+ - COMPILER="ccache /usr/bin/g++-5"
265+ - EXTRA_CXXFLAGS="-D_GLIBCXX_DEBUG -DUSE_STD_STRING"
224266
225267 # Run Coverity
226268 - stage : Test different OS/CXX/Flags
0 commit comments