From owner-svn-src-projects@freebsd.org  Tue Aug  8 17:26:20 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 82249DC4E21
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  8 Aug 2017 17:26:20 +0000 (UTC)
 (envelope-from asomers@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 4EACC6B5B9;
 Tue,  8 Aug 2017 17:26:20 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v78HQJvH019023;
 Tue, 8 Aug 2017 17:26:19 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v78HQJjF019021;
 Tue, 8 Aug 2017 17:26:19 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201708081726.v78HQJjF019021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 8 Aug 2017 17:26:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r322269 - in projects/zfsd/head: libexec/atf
 libexec/atf/atf-ksh93 share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head: libexec/atf libexec/atf/atf-ksh93
 share/mk
X-SVN-Commit-Revision: 322269
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2017 17:26:20 -0000

Author: asomers
Date: Tue Aug  8 17:26:19 2017
New Revision: 322269
URL: https://svnweb.freebsd.org/changeset/base/322269

Log:
  Remove atf-ksh93 in favor of atf-sh -s/usr/local/bin/ksh93.
  
  Shebangs are allowed to be passed arguments, and since atf-sh already
  accepts a -s argument to run the test using a different shell, just use that
  instead.  This eliminates the need for the hackish atf-ksh93.
  
  Submitted by:	will
  Sponsored by:	Spectra Logic Corp

Deleted:
  projects/zfsd/head/libexec/atf/atf-ksh93/
Modified:
  projects/zfsd/head/libexec/atf/Makefile
  projects/zfsd/head/share/mk/atf.test.mk

Modified: projects/zfsd/head/libexec/atf/Makefile
==============================================================================
--- projects/zfsd/head/libexec/atf/Makefile	Tue Aug  8 17:01:44 2017	(r322268)
+++ projects/zfsd/head/libexec/atf/Makefile	Tue Aug  8 17:26:19 2017	(r322269)
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check atf-ksh93 atf-sh tests
+SUBDIR=	atf-check atf-sh tests
 
 .include <bsd.subdir.mk>

Modified: projects/zfsd/head/share/mk/atf.test.mk
==============================================================================
--- projects/zfsd/head/share/mk/atf.test.mk	Tue Aug  8 17:01:44 2017	(r322268)
+++ projects/zfsd/head/share/mk/atf.test.mk	Tue Aug  8 17:26:19 2017	(r322269)
@@ -95,7 +95,7 @@ CLEANFILES+= ${_T} ${_T}.tmp
 ATF_TESTS_KSH93_SED_${_T}?= # empty
 ATF_TESTS_KSH93_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
-	echo '#! /usr/libexec/atf-ksh93' > ${.TARGET}.tmp
+	echo '#! /usr/libexec/atf-sh -s/usr/local/bin/ksh93' > ${.TARGET}.tmp
 .if empty(ATF_TESTS_KSH93_SED_${_T})
 	cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
 .else