From owner-svn-src-user@freebsd.org  Sun Dec  6 02:41:58 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5395A3B9CC
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun,  6 Dec 2015 02:41:58 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8024D1631;
 Sun,  6 Dec 2015 02:41:58 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB62fvCN008678;
 Sun, 6 Dec 2015 02:41:57 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB62fv5x008677;
 Sun, 6 Dec 2015 02:41:57 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512060241.tB62fv5x008677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 6 Dec 2015 02:41:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r291885 - user/ngie/make_check/share/mk
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Dec 2015 02:41:58 -0000

Author: ngie
Date: Sun Dec  6 02:41:57 2015
New Revision: 291885
URL: https://svnweb.freebsd.org/changeset/base/291885

Log:
  kyua automatically descends directories when running kyua test; only run
  make check on the top-level directory, not the TESTS_SUBDIRS subdirectories
  
  Leave SUBDIR alone; SUBDIR might contain a directory tree that needs
  `make check` run on it

Modified:
  user/ngie/make_check/share/mk/bsd.test.mk

Modified: user/ngie/make_check/share/mk/bsd.test.mk
==============================================================================
--- user/ngie/make_check/share/mk/bsd.test.mk	Sun Dec  6 01:58:12 2015	(r291884)
+++ user/ngie/make_check/share/mk/bsd.test.mk	Sun Dec  6 02:41:57 2015	(r291885)
@@ -57,11 +57,15 @@ _TESTS=
 .include <plain.test.mk>
 .include <tap.test.mk>
 
+# kyua automatically descends directories; only run make check on the
+# top-level directory
+.if !make(check)
 .for ts in ${TESTS_SUBDIRS}
 .if empty(SUBDIR:M${ts})
 SUBDIR+= ${ts}
 .endif
 .endfor
+.endif
 
 # it is rare for test cases to have man pages
 .if !defined(MAN)