summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ddfddb7)
raw | patch | inline | side by side (parent: ddfddb7)
author | Sebastian Harl <sh@tokkee.org> | |
Wed, 8 Jan 2014 10:15:07 +0000 (11:15 +0100) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Wed, 8 Jan 2014 10:15:07 +0000 (11:15 +0100) |
Using an env variable for this purpose, thus, making both options show up in
the Travis build matrix.
the Travis build matrix.
.travis.yml | patch | blob | history | |
t/cibuild.sh | patch | blob | history |
diff --git a/.travis.yml b/.travis.yml
index f544023a3f4b0e717ed6fcda5c58d681da693c91..d3bfbe959e61494ada6cb5ff156e2c64065ac54a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
language: c
+env:
+ - CIOPTIONS="--with-readline=libedit"
+ - CIOPTIONS="--with-readline=libreadline"
compiler:
- clang
- gcc
before_install:
- sudo apt-get update -qq
install:
- - sudo apt-get install -qq check flex bison libtool
- - sudo apt-get install -qq libdbi-dev libedit-dev libltdl-dev
+ - sudo apt-get install -qq check flex bison libtool libltdl-dev
+ - sudo apt-get install -qq libdbi-dev libedit-dev libreadline-dev
- sudo pip install cpp-coveralls --use-mirrors
script: ./t/cibuild.sh
after_success:
diff --git a/t/cibuild.sh b/t/cibuild.sh
index fdf4badceddae3091bb014e591e8f309250b0e58..e0754dbc2e2e982881ce4e27fc7423198406a8f4 100755 (executable)
--- a/t/cibuild.sh
+++ b/t/cibuild.sh
set -ex
./autogen.sh
-./configure --enable-gcov CFLAGS="-O0 -Wno-sign-conversion"
+./configure --enable-gcov $CIOPTIONS CFLAGS="-O0 -Wno-sign-conversion"
make clean all
make test