From owner-svn-src-stable-10@FreeBSD.ORG  Mon Dec 22 00:50:09 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 78DF923E;
 Mon, 22 Dec 2014 00:50:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 646DE3F5E;
 Mon, 22 Dec 2014 00:50:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBM0o96l080973;
 Mon, 22 Dec 2014 00:50:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBM0o9Mv080972;
 Mon, 22 Dec 2014 00:50:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201412220050.sBM0o9Mv080972@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 22 Dec 2014 00:50:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r276050 - stable/10/share/mk
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Dec 2014 00:50:09 -0000

Author: ngie
Date: Mon Dec 22 00:50:08 2014
New Revision: 276050
URL: https://svnweb.freebsd.org/changeset/base/276050

Log:
  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

Modified:
  stable/10/share/mk/bsd.test.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.test.mk
==============================================================================
--- stable/10/share/mk/bsd.test.mk	Mon Dec 22 00:50:01 2014	(r276049)
+++ stable/10/share/mk/bsd.test.mk	Mon Dec 22 00:50:08 2014	(r276050)
@@ -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)