Skip to content

Commit

Permalink
travis: handle CONFIGURE_OPTS as shell array
Browse files Browse the repository at this point in the history
  • Loading branch information
xdelaruelle committed Nov 12, 2017
1 parent 9257b9b commit 2a1c9bb
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ matrix:
# 3 package variants on major Tcl releases mixed with 2 install variants
# run tests in code coverage mode on first installation variant
# for each Tcl releases
- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.4 --disable-compat-version --prefix=/tmp/modules' MAKE_TESTCOVERAGE='y'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.4 --disable-compat-version --prefix=/tmp/modules) MAKE_TESTCOVERAGE='y'
EXTRA_SCRIPT_PRETEST='make install-testmodulerc' EXTRA_SCRIPT_POSTTEST='make uninstall-testconfig'
addons:
apt:
Expand All @@ -37,7 +37,7 @@ matrix:
- cmake3
- r-base-core
# install configuration file before test to trigger specific behaviors on initialization parts
- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.5 --disable-compat-version --prefix=/tmp/modules --without-pager' MAKE_TESTCOVERAGE='y'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.5 --disable-compat-version --prefix=/tmp/modules --without-pager) MAKE_TESTCOVERAGE='y'
EXTRA_SCRIPT_PRETEST='make install-testmodulerc && make install-testmodspath' EXTRA_SCRIPT_POSTTEST='make uninstall-testconfig'
addons:
apt:
Expand All @@ -58,7 +58,7 @@ matrix:
- cmake3
- r-base-core
# also enable a display on this test case to validate x-resource behavior
- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.6 --disable-compat-version --prefix=/tmp/modules --with-pager=more --with-pager-opts=-X' MAKE_TESTCOVERAGE='y'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.6 --disable-compat-version --prefix=/tmp/modules --with-pager=more --with-pager-opts=-X) MAKE_TESTCOVERAGE='y'
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
Expand All @@ -82,7 +82,7 @@ matrix:
- cmake3
- r-base-core

- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.4 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --without-pager'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.4 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --without-pager)
EXTRA_SCRIPT_PRETEST='make install-testmodulerc' EXTRA_SCRIPT_POSTTEST='make uninstall-testconfig'
addons:
apt:
Expand All @@ -108,7 +108,7 @@ matrix:
- autoconf
- autopoint
- tcl8.4-dev
- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.5 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-pager=more'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.5 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-pager=more)
EXTRA_SCRIPT_PRETEST='make install-testmodulerc && make install-testmodspath' EXTRA_SCRIPT_POSTTEST='make uninstall-testconfig'
addons:
apt:
Expand All @@ -134,7 +134,7 @@ matrix:
- autoconf
- autopoint
- tcl8.5-dev
- env: CONFIGURE_OPTS='--with-tclsh=tclsh8.6 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars="LD_LIBRARY_PATH FOO=VAL BAR=VAL2"'
- env: CONFIGURE_OPTS=(--with-tclsh=tclsh8.6 --prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars="LD_LIBRARY_PATH FOO=VAL BAR=VAL2")
addons:
apt:
sources:
Expand Down Expand Up @@ -163,30 +163,30 @@ matrix:
# CentOS tests
- env: OS_NAME=centos OS_VERSION=6 DOCKER_IMAGE=${OS_NAME}:${OS_NAME}${OS_VERSION} CONTAINER=${OS_NAME}${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER"
CONFIGURE_OPTS='--disable-compat-version'
CONFIGURE_OPTS=(--disable-compat-version)
sudo: required
services:
- docker

- env: OS_NAME=centos OS_VERSION=7 DOCKER_IMAGE=${OS_NAME}:${OS_NAME}${OS_VERSION} CONTAINER=${OS_NAME}${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER"
CONFIGURE_OPTS='--disable-compat-version'
CONFIGURE_OPTS=(--disable-compat-version)
sudo: required
services:
- docker

# also enable a display on this test case to validate x-resource behavior
- env: OS_NAME=centos OS_VERSION=6 DOCKER_IMAGE=${OS_NAME}:${OS_NAME}${OS_VERSION} CONTAINER=${OS_NAME}${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER xvfb-run"
CONFIGURE_OPTS='--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH'
CONFIGURE_OPTS=(--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH)
EXTRA_PKGS='xorg-x11-server-utils xorg-x11-server-Xvfb automake autoconf gettext-devel gcc tcl-devel'
sudo: required
services:
- docker

- env: OS_NAME=centos OS_VERSION=7 DOCKER_IMAGE=${OS_NAME}:${OS_NAME}${OS_VERSION} CONTAINER=${OS_NAME}${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER xvfb-run"
CONFIGURE_OPTS='--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH'
CONFIGURE_OPTS=(--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH)
EXTRA_PKGS='which xorg-x11-server-utils xorg-x11-server-Xvfb automake autoconf gettext-devel gcc tcl-devel'
sudo: required
services:
Expand All @@ -195,15 +195,15 @@ matrix:
# openSUSE
- env: OS_NAME=opensuse OS_VERSION=leap DOCKER_IMAGE=${OS_NAME}:${OS_VERSION} CONTAINER=${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER"
CONFIGURE_OPTS='--disable-compat-version'
CONFIGURE_OPTS=(--disable-compat-version)
sudo: required
services:
- docker

# also enable a display on this test case to validate x-resource behavior
- env: OS_NAME=opensuse OS_VERSION=leap DOCKER_IMAGE=${OS_NAME}:${OS_VERSION} CONTAINER=${OS_VERSION}
CMD_PREFIX="docker exec --env RUNTESTFLAGS=-v $CONTAINER xvfb-run"
CONFIGURE_OPTS='--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH'
CONFIGURE_OPTS=(--prefix=/tmp/modules --enable-compat-version --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH)
EXTRA_PKGS='which xrdb xvfb-run autoconf automake gettext-tools-mini gcc tcl-devel'
sudo: required
services:
Expand Down Expand Up @@ -239,7 +239,7 @@ before_install: |
fi
script:
- $CMD_PREFIX ./configure $CONFIGURE_OPTS
- $CMD_PREFIX ./configure "${CONFIGURE_OPTS[@]}"
- $CMD_PREFIX make
- if [ -n "$EXTRA_SCRIPT_PRETEST" ]; then $CMD_PREFIX eval $EXTRA_SCRIPT_PRETEST; fi
- if [ "$MAKE_TESTCOVERAGE" = 'y' ]; then $CMD_PREFIX make testcoverage; fi
Expand Down

0 comments on commit 2a1c9bb

Please sign in to comment.