Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Dec 2015 02:41:57 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r291885 - user/ngie/make_check/share/mk
Message-ID:  <201512060241.tB62fv5x008677@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



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