diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-27 23:17:26 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-27 23:17:26 +0100 |
| commit | c035b6552ba4bd1c6fba5fd8f8d829c2efbefe3c (patch) | |
| tree | 91c3ba591890ad3337011299219fd3105f7c56d2 | |
| parent | 8e2aa9904b1ef50e9480017feca7ef9d7391c078 (diff) | |
fix APTWEBSERVERBINDIR default
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | test/integration/framework | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d89315be6..2d9194c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: cpp before_install: - sudo apt-get update -q - sudo apt-get install -q --no-install-recommends dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml stunnel4 -script: make && make -C test/interactive-helper/ && make test && test/integration/run-tests +script: make && make test && test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index c6422ca6f..a28363768 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -161,7 +161,7 @@ setupenvironment() { # allow overriding the default BUILDDIR location BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"} METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} - APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-BUILDDIRECTORY} + APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- |