summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-11-28 17:23:08 +0000
committerAtomic Bot <atomic-devel@projectatomic.io>2016-11-29 14:11:50 +0000
commitdb691b552032bfdc526cb58a06f64c07a6ff527e (patch)
treeaa737d13b150d6dde4c93ed70112eed572b9245b
parent49b8ccd8cbfe4a09ee09b85b410bfd8f3e5d1b06 (diff)
downloadostree-db691b552032bfdc526cb58a06f64c07a6ff527e.tar.gz
travis-ci: Move helper function to before we start building anything
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Closes: #600 Approved by: cgwalters
-rwxr-xr-xtests/ci-build.sh13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/ci-build.sh b/tests/ci-build.sh
index 42c2dcff..ae52787e 100755
--- a/tests/ci-build.sh
+++ b/tests/ci-build.sh
@@ -44,6 +44,12 @@ if [ -n "$ci_docker" ]; then
tests/ci-build.sh
fi
+maybe_fail_tests () {
+ if [ "$ci_test_fatal" = yes ]; then
+ exit 1
+ fi
+}
+
NOCONFIGURE=1 ./autogen.sh
srcdir="$(pwd)"
@@ -58,13 +64,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
"$@"
${make}
-
-maybe_fail_tests () {
- if [ "$ci_test_fatal" = yes ]; then
- exit 1
- fi
-}
-
[ "$ci_test" = no ] || ${make} check || maybe_fail_tests
# TODO: if ostree aims to support distcheck, run that too