From 2059f871fd7006d538a9b46b5e258f007622e994 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 18 Nov 2017 12:52:24 +0100 Subject: [PATCH] common/xbps-src: make docheck use run_step. This allows a build_style to define a generic do_check function. --- common/xbps-src/libexec/xbps-src-docheck.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/common/xbps-src/libexec/xbps-src-docheck.sh b/common/xbps-src/libexec/xbps-src-docheck.sh index 654cc99617..0c4f1f3a38 100755 --- a/common/xbps-src/libexec/xbps-src-docheck.sh +++ b/common/xbps-src/libexec/xbps-src-docheck.sh @@ -36,18 +36,7 @@ for f in $XBPS_COMMONDIR/environment/check/*.sh; do source_file "$f" done -cd "$wrksrc" || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc]\n" -if [ -n "$build_wrksrc" ]; then - cd $build_wrksrc || \ - msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc]\n" -fi - -# Run do_check() if the function is defined -if declare -f do_check > /dev/null; then - run_func do_check -else - msg_normal "${pkgname}-${version}_${revision}: template does not have do_check() ...\n" -fi +run_step check optional touch -f $XBPS_CHECK_DONE