summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2017-11-01 16:47:01 +0000
committerSimon McVittie <smcv@collabora.com>2017-11-01 16:47:01 +0000
commita1f95028652b69f0fefb13b2601b5621d6c550e6 (patch)
tree1e1eb1a43554c467194e7254ab0291a328820a12 /tools
parentda4bc242486df24f5c34153476f49a03c1e8aac1 (diff)
ci-build: Write out config.log after attempting configure
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci-build.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 9bdda39..62ca7d4 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -96,12 +96,17 @@ fi
NOCONFIGURE=1 ./autogen.sh
+e=0
(
cd "$builddir" && "${srcdir}/configure" \
--enable-installed-tests \
--prefix="$prefix" \
${NULL}
-)
+) || e=1
+if [ "x$e" != x0 ] || [ -n "$TRAVIS" ]; then
+ cat "$builddir/config.log"
+fi
+test "x$e" = x0
make="make -j${dbus_ci_parallel} V=1 VERBOSE=1"