svn commit: r322269 - in projects/zfsd/head: libexec/atf libexec/atf/atf-ksh93 share/mk

[Alan Somers]

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