Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Mar 2020 20:04:56 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r359456 - head
Message-ID:  <202003302004.02UK4uAJ070139@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Mon Mar 30 20:04:55 2020
New Revision: 359456
URL: https://svnweb.freebsd.org/changeset/base/359456

Log:
  Relax existence check of ${LOCALBASE}/bin/kyua
  
  After the base kyua import the testsuite can utilize the in-base kyua
  just fine.
  
  Submitted by:	Dries Michiels
  Differential Revision:	https://reviews.freebsd.org/D24230

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Mar 30 20:01:44 2020	(r359455)
+++ head/Makefile.inc1	Mon Mar 30 20:04:55 2020	(r359456)
@@ -1988,7 +1988,7 @@ sign-packages:	_pkgbootstrap .PHONY
 # Run test suite on installed world.
 #
 checkworld: .PHONY
-	@if [ ! -x "${LOCALBASE}/bin/kyua" ]; then \
+	@if [ ! -x "${LOCALBASE}/bin/kyua" ] && [ ! -x "/usr/bin/kyua" ]; then \
 		echo "You need kyua (devel/kyua) to run the test suite." | /usr/bin/fmt; \
 		exit 1; \
 	fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003302004.02UK4uAJ070139>