CI: change strategy to pass CXXFLAGS and the like

Putting them in the env is useless.  We don't want to pass
`CPPFLAGS="$CPPFLAGS"` to configure, as it means "set it to nothing"
when $CPPFLAGS is not set, which is not what we want.

This correctly started to use libc++, but it is not installed on the
Ubuntu.  We will see later if we can use it.

* .travis.yml: Define CONFIGUREFLAGS, and pass it to configure.
This commit is contained in:
Akim Demaille
2018-09-16 18:30:13 +02:00
parent 8cbc235723
commit 9458250968

View File

@@ -30,7 +30,7 @@ matrix:
packages: packages:
- g++-7 - g++-7
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && CPPFLAGS=-DNDEBUG && CFLAGS=-O3 && CXXFLAGS=-O3" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && CONFIGUREFLAGS='CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3'"
- name: "GCC 6" - name: "GCC 6"
os: linux os: linux
@@ -110,7 +110,7 @@ matrix:
packages: packages:
- clang-5.0 - clang-5.0
env: env:
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && CPPFLAGS=-DNDEBUG && CFLAGS=-O3 && CXXFLAGS=-O3 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && CONFIGUREFLAGS='CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3'"
- name: "Clang 5 ASAN" - name: "Clang 5 ASAN"
os: linux os: linux
@@ -121,7 +121,7 @@ matrix:
packages: packages:
- clang-5.0 - clang-5.0
env: env:
- MATRIX_EVAL="CC='clang-5.0 -fsanitize=address' && CXX='clang++-5.0 -fsanitize=address' && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC='clang-5.0 -fsanitize=address' && CXX='clang++-5.0 -fsanitize=address'"
- name: "Clang 4" - name: "Clang 4"
os: linux os: linux
@@ -132,7 +132,7 @@ matrix:
packages: packages:
- clang-4.0 - clang-4.0
env: env:
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
- name: "Clang 3.9" - name: "Clang 3.9"
os: linux os: linux
@@ -143,7 +143,7 @@ matrix:
packages: packages:
- clang-3.9 - clang-3.9
env: env:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
- name: "Clang 3.8" - name: "Clang 3.8"
os: linux os: linux
@@ -155,7 +155,7 @@ matrix:
packages: packages:
- clang-3.8 - clang-3.8
env: env:
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
- name: "CLang 3.7" - name: "CLang 3.7"
os: linux os: linux
@@ -167,7 +167,7 @@ matrix:
packages: packages:
- clang-3.7 - clang-3.7
env: env:
- MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
- name: "Clang 3.6" - name: "Clang 3.6"
os: linux os: linux
@@ -179,7 +179,7 @@ matrix:
packages: packages:
- clang-3.6 - clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
- name: "Clang 3.5" - name: "Clang 3.5"
os: linux os: linux
@@ -191,7 +191,7 @@ matrix:
packages: packages:
- clang-3.5 - clang-3.5
env: env:
- MATRIX_EVAL="CC=clang-3.5 && CXX=clang++-3.5 && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang-3.5 && CXX=clang++-3.5"
- name: "Clang 3.4" - name: "Clang 3.4"
os: linux os: linux
@@ -201,7 +201,7 @@ matrix:
- clang-3.4 - clang-3.4
env: env:
# No versioned name installed. # No versioned name installed.
- MATRIX_EVAL="CC=clang && CXX=clang++ && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang && CXX=clang++"
- name: "Clang 3.3" - name: "Clang 3.3"
os: linux os: linux
@@ -211,7 +211,7 @@ matrix:
- clang-3.3 - clang-3.3
env: env:
# No versioned name installed. # No versioned name installed.
- MATRIX_EVAL="CC=clang && CXX=clang++ && CXXFLAGS=-stdlib=libc++" - MATRIX_EVAL="CC=clang && CXX=clang++"
## ----- ## ## ----- ##
## ICC. ## ## ICC. ##
@@ -249,7 +249,7 @@ script:
- git describe - git describe
- ./bootstrap - ./bootstrap
- if [[ -f ~/.bashrc ]]; then source ~/.bashrc; fi - if [[ -f ~/.bashrc ]]; then source ~/.bashrc; fi
- ./configure --enable-gcc-warnings CC="$CC" CXX="$CXX" || { cat config.log && exit 1; } - ./configure --enable-gcc-warnings CC="$CC" CXX="$CXX" $CONFIGUREFLAGS || { cat config.log && exit 1; }
- make -j2 $MAKE_ARGS - make -j2 $MAKE_ARGS
- make check VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } - make check VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; }
- make maintainer-check-posix VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } - make maintainer-check-posix VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; }