From 95c5e63dce1047f5bc0759ed9d47fc994ba7c079 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 11 Sep 2017 11:15:21 +0100 Subject: [PATCH 1/2] Disable Alpine in Travis --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a772cb400d1..819f340875f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,20 +39,6 @@ jobs: # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer" env: COMPILER="ccache g++-5" - # Alpine Linux with musl-libc using g++ - - stage: Test different OS/CXX/Flags - os: linux - sudo: required - compiler: gcc - cache: ccache - services: - - docker - before_install: - - docker pull diffblue/cbmc-builder:alpine-0.0.3 - env: - - PRE_COMMAND="docker run -v ${TRAVIS_BUILD_DIR}:/cbmc -v ${HOME}/.ccache:/root/.ccache diffblue/cbmc-builder:alpine-0.0.3" - - COMPILER="ccache g++" - # OS X using g++ - stage: Test different OS/CXX/Flags os: osx From 0cfd7b055527bd86c293eddc765fbceafa223067 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 11 Sep 2017 11:24:34 +0100 Subject: [PATCH 2/2] Remove PRE_COMMAND scaffolding --- .travis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 819f340875f..5aca4c423ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,22 +142,16 @@ jobs: install: - ccache --max-size=1G - - COMMAND="make -C src minisat2-download" && - eval ${PRE_COMMAND} ${COMMAND} - - COMMAND="make -C src/ansi-c library_check" && - eval ${PRE_COMMAND} ${COMMAND} - - COMMAND="make -C src CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\" -j2" && - eval ${PRE_COMMAND} ${COMMAND} - - COMMAND="make -C src CXX=\"$COMPILER\" CXXFLAGS=\"$FLAGS $EXTRA_CXXFLAGS\" -j2 clobber.dir memory-models.dir musketeer.dir" && - eval ${PRE_COMMAND} ${COMMAND} + - make -C src minisat2-download + - make -C src/ansi-c library_check + - make -C src "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2 + - make -C src "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2 clobber.dir memory-models.dir musketeer.dir script: - if [ -e bin/gcc ] ; then export PATH=$PWD/bin:$PATH ; fi ; - COMMAND="env UBSAN_OPTIONS=print_stacktrace=1 make -C regression test CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\"" && - eval ${PRE_COMMAND} ${COMMAND} - - COMMAND="make -C unit CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\" -j2" && - eval ${PRE_COMMAND} ${COMMAND} - - COMMAND="make -C unit test" && eval ${PRE_COMMAND} ${COMMAND} + - env UBSAN_OPTIONS=print_stacktrace=1 make -C regression test "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" + - make -C unit "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2 + - make -C unit test before_cache: - ccache -s