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
This commit is contained in:
Simon McVittie 2016-11-28 17:23:08 +00:00 committed by Atomic Bot
parent 49b8ccd8cb
commit db691b5520
1 changed files with 6 additions and 7 deletions

View File

@ -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