MFC r273803,r273810:

r273803:

  Filter out TESTS_SUBDIRS already added to SUBDIR instead of blindly
  appending the TESTS_SUBDIRS variable to SUBDIR

  Duplicate directory entries can cause unexpected side effects, like
  installing the same files multiple times. This can be easily
  reproduced via the following testcase prior to this commit:

    SUBDIR= dir
    TESTS_SUBDIRS+= dir

    .include <bsd.test.mk>

  Sponsored by: EMC / Isilon Storage Division

r273810:

  Fix the logic inversion in the previous commit by ensuring that the matched
  expression (:M) is empty, not the not matched (:N) is empty. The former case
  means we have not found the TEST_SUBDIR value in SUBDIR

  Reported by: rodrigc
  Pointyhat to: me (did not use a clean install root)
  Sponsored by: EMC / Isilon Storage Division

1 files changed, 4 insertions, 2 deletions

diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 38e945e..fb841da 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -54,9 +54,11 @@ _TESTS=
 .include <plain.test.mk>
 .include <tap.test.mk>
 
-.if !empty(TESTS_SUBDIRS)
-SUBDIR+= ${TESTS_SUBDIRS}
+.for ts in ${TESTS_SUBDIRS}
+.if empty(SUBDIR:M${ts})
+SUBDIR+= ${ts}
 .endif
+.endfor
 
 # it is rare for test cases to have man pages
 .if !defined(MAN)