Date: Saturday, February 4, 2017 @ 23:59:32
  Author: bisson
Revision: 288057

make tests' graceful dropout work

Modified:
  openssh/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-02-04 23:30:36 UTC (rev 288056)
+++ PKGBUILD    2017-02-04 23:59:32 UTC (rev 288057)
@@ -56,14 +56,13 @@
 check() {
        cd "${srcdir}/${pkgname}-${pkgver}"
 
-       [[ -e /.arch-chroot ]] && return
-       # Connectivity tests will fail under makechrootpkg since
-       # it runs as nobody which has /bin/false as login shell.
+       # Tests require openssh to be already installed system-wide,
+       # also connectivity tests will fail under makechrootpkg since
+        # it runs as nobody which has /bin/false as login shell.
 
-       [[ -e /usr/bin/scp ]] || return
-       # Tests require openssh to be already installed system-wide.
-
-       make tests
+       if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+               make tests
+       fi
 }
 
 package() {

Reply via email to