From owner-svn-src-all@FreeBSD.ORG  Mon Jan 13 10:47:27 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 09B5BF6B;
 Mon, 13 Jan 2014 10:47:27 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E9BCC1F53;
 Mon, 13 Jan 2014 10:47:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DAlQFu025359;
 Mon, 13 Jan 2014 10:47:26 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DAlQXF025358;
 Mon, 13 Jan 2014 10:47:26 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201401131047.s0DAlQXF025358@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Mon, 13 Jan 2014 10:47:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260584 - head/usr.bin/atf/atf-sh/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 10:47:27 -0000

Author: jmmv
Date: Mon Jan 13 10:47:26 2014
New Revision: 260584
URL: http://svnweb.freebsd.org/changeset/base/260584

Log:
  Prevent misc_helpers from running as a test.
  
  Do this by generating misc_helpers explicitly, without using the
  ATF_TESTS_SH functionality.
  
  While this script is technically an atf-sh test program, it is not intended
  to be run as a test and therefore it mustn't end up in the Kyuafile.  Using
  ATF_TESTS_SH means that misc_helpers ended up registered in the Kyuafile
  and then failed to run as a test.
  
  The alternative would be to supply an explicit Kyuafile from this directory
  that lists the known test files, but doing it the way described above will
  be easier to maintain.
  
  MFC after:	3 days

Modified:
  head/usr.bin/atf/atf-sh/tests/Makefile

Modified: head/usr.bin/atf/atf-sh/tests/Makefile
==============================================================================
--- head/usr.bin/atf/atf-sh/tests/Makefile	Mon Jan 13 04:46:48 2014	(r260583)
+++ head/usr.bin/atf/atf-sh/tests/Makefile	Mon Jan 13 10:47:26 2014	(r260584)
@@ -10,9 +10,17 @@ ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 ATF_TESTS_SH+=	atf_check_test
 ATF_TESTS_SH+=	config_test
 ATF_TESTS_SH+=	integration_test
-ATF_TESTS_SH+=	misc_helpers
 ATF_TESTS_SH+=	normalize_test
 ATF_TESTS_SH+=	tc_test
 ATF_TESTS_SH+=	tp_test
 
+SCRIPTS+=		misc_helpers
+SCRIPTSDIR_misc_helpers=${TESTSDIR}
+CLEANFILES+=		misc_helpers misc_helpers.tmp
+misc_helpers: misc_helpers.sh
+	echo '#! /usr/bin/atf-sh' >${.TARGET}.tmp
+	cat ${.ALLSRC} >>${.TARGET}.tmp
+	chmod +x ${.TARGET}.tmp
+	mv ${.TARGET}.tmp ${.TARGET}
+
 .include <atf.test.mk>