xbps-src: implement a 'check' stage
Add another stage 'check' between 'build' and 'install'. It is be enabled using the variable XBPS_CHECK_PKGS=yes and disabled if unset, set to "0" or "no" in your local etc/conf. A new xbps-src option `-q` for `quick` will disable XBPS_CHECK_PKGS by overriding it to 0. If enabled, `common/xbps-src/shutils/xbps-src-docheck.sh` checks for an existing `do_check()` function in the package's template and, if it exists, calls it. A new template variable `checkdepends` may be present and list packages required to run the `do_check()` function. Example: `checkdepends="bc unittest-cpp"`.
This commit is contained in:
Jürgen Buchmüller
parent
f9dface61c
commit
c31dd888f6
14 changed files with 156 additions and 13 deletions
|
|
@ -49,6 +49,13 @@ setup_pkg_depends() {
|
|||
_depver=$(srcpkg_get_version ${_depname}) || exit $?
|
||||
host_build_depends+=" ${_depname}-${_depver}"
|
||||
done
|
||||
if ! [ -z "$XBPS_CHECK_PKGS" -o "$XBPS_CHECK_PKGS" = "0" -o "$XBPS_CHECK_PKGS" = "no" ]; then
|
||||
for j in ${checkdepends}; do
|
||||
_depname="${j%\?*}"
|
||||
_depver=$(srcpkg_get_version ${_depname}) || exit $?
|
||||
host_check_depends+=" ${_depname}-${_depver}"
|
||||
done
|
||||
fi
|
||||
for j in ${makedepends}; do
|
||||
_depname="${j%\?*}"
|
||||
_depver=$(srcpkg_get_version ${_depname}) || exit $?
|
||||
|
|
@ -183,7 +190,8 @@ install_pkg_deps() {
|
|||
local rval _realpkg _vpkg _curpkg curpkgdepname pkgn iver
|
||||
local i j found rundep repo
|
||||
|
||||
local -a host_binpkg_deps binpkg_deps host_missing_deps missing_deps missing_rdeps
|
||||
local -a host_binpkg_deps check_binpkg_deps binpkg_deps
|
||||
local -a host_missing_deps check_missing_deps missing_deps missing_rdeps
|
||||
|
||||
[ -z "$pkgname" ] && return 2
|
||||
|
||||
|
|
@ -195,7 +203,7 @@ install_pkg_deps() {
|
|||
msg_normal "$pkgver: building ...\n"
|
||||
fi
|
||||
|
||||
if [ -z "$build_depends" -a -z "$host_build_depends" -a -z "$run_depends" ]; then
|
||||
if [ -z "$build_depends" -a -z "$host_build_depends" -a -z "$host_check_depends" -a -z "$run_depends" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
|
@ -231,6 +239,39 @@ install_pkg_deps() {
|
|||
host_missing_deps+=("${i}")
|
||||
done
|
||||
|
||||
#
|
||||
# Host check dependencies.
|
||||
#
|
||||
for i in ${host_check_depends}; do
|
||||
check_pkgdep_matched "$i" version
|
||||
local rval=$?
|
||||
if [ $rval -eq 0 ]; then
|
||||
echo " [check] ${i}: installed."
|
||||
continue
|
||||
elif [ $rval -eq 1 ]; then
|
||||
_realpkg="$($XBPS_UHELPER_CMD getpkgname $i 2>/dev/null)"
|
||||
iver=$($XBPS_UHELPER_CMD version ${_realpkg})
|
||||
if [ $? -eq 0 -a -n "$iver" ]; then
|
||||
echo " [check] ${i}: installed $iver (virtualpkg)."
|
||||
continue
|
||||
else
|
||||
echo " [check] ${i}: unresolved check dependency!"
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
repo=$($XBPS_QUERY_CMD -R -prepository ${i} 2>/dev/null)
|
||||
if [ -n "${repo}" ]; then
|
||||
echo " [check] ${i}: found ($repo)"
|
||||
check_binpkg_deps+=("${i}")
|
||||
continue
|
||||
else
|
||||
echo " [check] ${i}: not found."
|
||||
fi
|
||||
fi
|
||||
check_missing_deps+=("${i}")
|
||||
done
|
||||
|
||||
|
||||
#
|
||||
# Target build dependencies.
|
||||
#
|
||||
|
|
@ -324,7 +365,7 @@ install_pkg_deps() {
|
|||
missing_rdeps+=("${_realpkg}")
|
||||
done
|
||||
|
||||
# Host missing dependencies, build from srcpkgs.
|
||||
# Missing host dependencies, build from srcpkgs.
|
||||
for i in ${host_missing_deps[@]}; do
|
||||
# packages not found in repos, install from source.
|
||||
(
|
||||
|
|
@ -336,7 +377,19 @@ install_pkg_deps() {
|
|||
host_binpkg_deps+=("$i")
|
||||
done
|
||||
|
||||
# Target missing dependencies, build from srcpkgs.
|
||||
# Missing check dependencies, build from srcpkgs.
|
||||
for i in ${check_missing_deps[@]}; do
|
||||
# packages not found in repos, install from source.
|
||||
(
|
||||
curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null)
|
||||
setup_pkg $curpkgdepname
|
||||
exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \
|
||||
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target || exit $?
|
||||
) || exit $?
|
||||
check_binpkg_deps+=("$i")
|
||||
done
|
||||
|
||||
# Missing target dependencies, build from srcpkgs.
|
||||
for i in ${missing_deps[@]}; do
|
||||
# packages not found in repos, install from source.
|
||||
(
|
||||
|
|
@ -374,6 +427,11 @@ install_pkg_deps() {
|
|||
install_pkg_from_repos "${i}"
|
||||
done
|
||||
|
||||
for i in ${check_binpkg_deps[@]}; do
|
||||
msg_normal "$pkgver: installing check dependency '$i' ...\n"
|
||||
install_pkg_from_repos "${i}"
|
||||
done
|
||||
|
||||
for i in ${binpkg_deps[@]}; do
|
||||
msg_normal "$pkgver: installing target dependency '$i' ...\n"
|
||||
install_pkg_from_repos "$i" $cross
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
|
|||
PATH=/void-packages:/usr/bin:/usr/sbin
|
||||
|
||||
exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
|
||||
CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
|
||||
@@CHECK@@ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
|
||||
PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
|
||||
_EOF
|
||||
if [ -n "$XBPS_ARCH" ]; then
|
||||
|
|
@ -41,6 +41,11 @@ _EOF
|
|||
else
|
||||
sed -e 's,@@XARCH@@,,g' -i $XBPS_MASTERDIR/bin/xbps-shell
|
||||
fi
|
||||
if [ -z "$XBPS_CHECK_PKGS" -o "$XBPS_CHECK_PKGS" = "0" -o "$XBPS_CHECK_PKGS" = "no" ]; then
|
||||
sed -e 's,@@CHECK@@,,g' -i $XBPS_MASTERDIR/bin/xbps-shell
|
||||
else
|
||||
sed -e "s,@@CHECK@@,XBPS_CHECK_PKGS=$XBPS_CHECK_PKGS,g" -i $XBPS_MASTERDIR/bin/xbps-shell
|
||||
fi
|
||||
chmod 755 $XBPS_MASTERDIR/bin/xbps-shell
|
||||
|
||||
cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
|
||||
|
|
@ -170,7 +175,7 @@ chroot_handler() {
|
|||
[ -z "$action" -a -z "$pkg" ] && return 1
|
||||
|
||||
case "$action" in
|
||||
fetch|extract|build|configure|install|install-destdir|pkg|build-pkg|bootstrap-update|chroot)
|
||||
fetch|extract|build|check|configure|install|install-destdir|pkg|build-pkg|bootstrap-update|chroot)
|
||||
chroot_prepare || return $?
|
||||
chroot_init || return $?
|
||||
chroot_sync_repos || return $?
|
||||
|
|
@ -188,6 +193,7 @@ chroot_handler() {
|
|||
[ -n "$XBPS_BUILD_FORCEMODE" ] && arg="$arg -f"
|
||||
[ -n "$XBPS_MAKEJOBS" ] && arg="$arg -j$XBPS_MAKEJOBS"
|
||||
[ -n "$XBPS_DEBUG_PKGS" ] && arg="$arg -g"
|
||||
[ -z "$XBPS_CHECK_PKGS" -o "$XBPS_CHECK_PKGS" = "0" -o "$XBPS_CHECK_PKGS" = "no" ] && arg="$arg -q"
|
||||
[ -n "$XBPS_SKIP_DEPS" ] && arg="$arg -I"
|
||||
[ -n "$XBPS_ALT_REPOSITORY" ] && arg="$arg -r $XBPS_ALT_REPOSITORY"
|
||||
[ -n "$XBPS_USE_GIT_REVS" ] && arg="$arg -G"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ consistency_check_existing () {
|
|||
while IFS=" " read -r dep origname deplabel; do
|
||||
[ -f "$XBPS_SRCPKGDIR/$dep/template" ] && continue
|
||||
case "$deplabel" in
|
||||
makedepends|hostmakedepends)
|
||||
makedepends|hostmakedepends|checkdepends)
|
||||
msg_warn "unsatisfied $deplabel in $origname: $dep does not exist\n";
|
||||
;;
|
||||
*) printf "%s %s %s\n" "$dep" "$origname" "$deplabel" ;;
|
||||
|
|
@ -16,7 +16,7 @@ consistency_convert_pkgname () {
|
|||
local origname= pkgname version= revision=
|
||||
while IFS=" " read -r dep origname deplabel; do
|
||||
case "$deplabel" in
|
||||
makedepends|hostmakedepends)
|
||||
makedepends|hostmakedepends|checkdepends)
|
||||
printf "%s %s %s\n" "$dep" "$origname" "$deplabel"
|
||||
continue
|
||||
;;
|
||||
|
|
@ -41,7 +41,7 @@ consistency_check_smart () {
|
|||
local pkgname= depdef= dep=
|
||||
while IFS=" " read -r depdef origname deplabel; do
|
||||
case "$deplabel" in
|
||||
makedepends|hostmakedepends)
|
||||
makedepends|hostmakedepends|checkdepends)
|
||||
printf "%s %s %s\n" "$depdef" "$origname" "$deplabel"
|
||||
continue
|
||||
;;
|
||||
|
|
@ -73,6 +73,7 @@ consistency_check() {
|
|||
[ -L "$XBPS_SRCPKGDIR/$XBPS_TARGET_PKG" ] && continue
|
||||
[ "$makedepends" ] && printf "%s $pkgname makedepends\n" $makedepends
|
||||
[ "$hostmakedepends" ] && printf "%s $pkgname hostmakedepends\n" $hostmakedepends
|
||||
[ "$checkdepends" ] && printf "%s $pkgname checkdepends\n" $checkdepends
|
||||
)
|
||||
done | grep -v "^virtual?" | sed "s/^[^ ]*?//" | consistency_check_existing | \
|
||||
consistency_convert_pkgname | consistency_check_smart
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue