summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2020-02-17 06:48:33 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2020-02-17 06:48:33 +0100
commitcb4985acada51bd9bfe4e2cc9ff399d75fee9990 (patch)
tree30068fd4cec2d4f572bdcbf773d3528da936743c
parent1bc508235a400f08f3a9ef2e6c41455d086bd747 (diff)
downloadlibgphoto2-cb4985acada51bd9bfe4e2cc9ff399d75fee9990.tar.gz
travis-ci: Still trying
-rw-r--r--.travis-script.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/.travis-script.sh b/.travis-script.sh
index bea347023..dee133286 100644
--- a/.travis-script.sh
+++ b/.travis-script.sh
@@ -7,16 +7,10 @@ ls -l configure
shift
-abs_topsrcdir="$(pwd)"
-
-mkdir "_build-${buildid}"
-
-set -e
set -x
-cd "_build-${buildid}"
-
-abs_prefixdir="${abs_topsrcdir}/_root-${buildid}"
+head -n1 configure
+head -n1 .travis-script.sh
pkg-config --short-errors --print-errors --cflags --libs 'libexif >= 0.6.13'
@@ -24,6 +18,15 @@ LIBEXIF_PKG_ERRORS="$(pkg-config --short-errors --print-errors --cflags --libs "
LIBEXIF_PKG_ERRORS=`pkg-config --short-errors --print-errors --cflags --libs "libexif >= 0.6.13" 2>&1`
+set -e
+
+abs_topsrcdir="$(pwd)"
+
+mkdir "_build-${buildid}"
+cd "_build-${buildid}"
+
+abs_prefixdir="${abs_topsrcdir}/_root-${buildid}"
+
if ../configure SLEEP=/bin/true --prefix="$abs_prefixdir" "$@"
then
echo "Configure successful."