build/test: restrucure a tiny bit

The migrations don't run because PHP isn't active.  That's an issue
of configd never being initialised, which we came to before so we
may need a bootstrap template for both php.ini files just in case.
This commit is contained in:
Franco Fichtner 2017-08-21 09:55:31 +02:00
parent e571bac057
commit 30e0693df0
1 changed files with 8 additions and 9 deletions

View File

@ -31,8 +31,8 @@ SELF=test
. ./common.sh
git_branch ${COREDIR} ${COREBRANCH} COREBRANCH
git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH
git_branch ${COREDIR} ${COREBRANCH} COREBRANCH
setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}
@ -41,14 +41,7 @@ setup_clone ${STAGEDIR} ${PLUGINSDIR}
setup_chroot ${STAGEDIR}
extract_packages ${STAGEDIR}
install_packages ${STAGEDIR} pkg ${PRODUCT_PKGNAME} "os-*${PRODUCT_SUFFIX}"
# don't want to deinstall in case of testing...
echo ">>> Running ${PLUGINSDIR} test suite..."
chroot ${STAGEDIR} /bin/sh -es <<EOF
make -C${PLUGINSDIR} lint
make -C${PLUGINSDIR} style
EOF
install_packages ${STAGEDIR} "os-*${PRODUCT_SUFFIX}" ${PRODUCT_PKGNAME}
echo ">>> Running packages test suite..."
chroot ${STAGEDIR} /bin/sh -es <<EOF
@ -56,6 +49,12 @@ pkg check -da
pkg check -sa
EOF
echo ">>> Running ${PLUGINSDIR} test suite..."
chroot ${STAGEDIR} /bin/sh -es <<EOF
make -C${PLUGINSDIR} lint
make -C${PLUGINSDIR} style
EOF
echo ">>> Running ${COREDIR} test suite..."
chroot ${STAGEDIR} /bin/sh -es <<EOF