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:
parent
49b8ccd8cb
commit
db691b5520
|
|
@ -44,6 +44,12 @@ if [ -n "$ci_docker" ]; then
|
||||||
tests/ci-build.sh
|
tests/ci-build.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
maybe_fail_tests () {
|
||||||
|
if [ "$ci_test_fatal" = yes ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
||||||
srcdir="$(pwd)"
|
srcdir="$(pwd)"
|
||||||
|
|
@ -58,13 +64,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
${make}
|
${make}
|
||||||
|
|
||||||
maybe_fail_tests () {
|
|
||||||
if [ "$ci_test_fatal" = yes ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
[ "$ci_test" = no ] || ${make} check || maybe_fail_tests
|
[ "$ci_test" = no ] || ${make} check || maybe_fail_tests
|
||||||
# TODO: if ostree aims to support distcheck, run that too
|
# TODO: if ostree aims to support distcheck, run that too
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue