Index: projects/release-pkg/bin/sh/tests/builtins/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/builtins/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/builtins/Makefile	(revision 295215)
@@ -1,180 +1,179 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		alias.0 alias.0.stdout
 FILES+=		alias.1 alias.1.stderr
 FILES+=		alias3.0 alias3.0.stdout
 FILES+=		alias4.0
 FILES+=		break1.0
 FILES+=		break2.0 break2.0.stdout
 FILES+=		break3.0
 FILES+=		break4.4
 FILES+=		break5.4
 FILES+=		break6.0
 FILES+=		builtin1.0
 FILES+=		case1.0
 FILES+=		case2.0
 FILES+=		case3.0
 FILES+=		case4.0
 FILES+=		case5.0
 FILES+=		case6.0
 FILES+=		case7.0
 FILES+=		case8.0
 FILES+=		case9.0
 FILES+=		case10.0
 FILES+=		case11.0
 FILES+=		case12.0
 FILES+=		case13.0
 FILES+=		case14.0
 FILES+=		case15.0
 FILES+=		case16.0
 FILES+=		case17.0
 FILES+=		case18.0
 FILES+=		case19.0
 FILES+=		case20.0
 FILES+=		cd1.0
 FILES+=		cd2.0
 FILES+=		cd3.0
 FILES+=		cd4.0
 FILES+=		cd5.0
 FILES+=		cd6.0
 FILES+=		cd7.0
 FILES+=		cd8.0
 FILES+=		cd9.0 cd9.0.stdout
 FILES+=		command1.0
 FILES+=		command2.0
 FILES+=		command3.0
 FILES+=		command3.0.stdout
 FILES+=		command4.0
 FILES+=		command5.0
 FILES+=		command5.0.stdout
 FILES+=		command6.0
 FILES+=		command6.0.stdout
 FILES+=		command7.0
 FILES+=		command8.0
 FILES+=		command9.0
 FILES+=		command10.0
 FILES+=		command11.0
 FILES+=		command12.0
 FILES+=		dot1.0
 FILES+=		dot2.0
 FILES+=		dot3.0
 FILES+=		dot4.0
 FILES+=		eval1.0
 FILES+=		eval2.0
 FILES+=		eval3.0
 FILES+=		eval4.0
 FILES+=		eval5.0
 FILES+=		eval6.0
 FILES+=		eval7.0
 FILES+=		eval8.7
 FILES+=		exec1.0
 FILES+=		exec2.0
 FILES+=		exit1.0
 FILES+=		exit2.8
 FILES+=		exit3.0
 FILES+=		export1.0
 FILES+=		fc1.0
 FILES+=		fc2.0
 FILES+=		for1.0
 FILES+=		for2.0
 FILES+=		for3.0
 FILES+=		getopts1.0 getopts1.0.stdout
 FILES+=		getopts2.0 getopts2.0.stdout
 FILES+=		getopts3.0
 FILES+=		getopts4.0
 FILES+=		getopts5.0
 FILES+=		getopts6.0
 FILES+=		getopts7.0
 FILES+=		getopts8.0 getopts8.0.stdout
 FILES+=		getopts9.0 getopts9.0.stdout
 FILES+=		getopts10.0
 FILES+=		hash1.0 hash1.0.stdout
 FILES+=		hash2.0 hash2.0.stdout
 FILES+=		hash3.0 hash3.0.stdout
 FILES+=		hash4.0
 FILES+=		jobid1.0
 FILES+=		jobid2.0
 FILES+=		kill1.0 kill2.0
 FILES+=		lineno.0 lineno.0.stdout
 FILES+=		lineno2.0
 FILES+=		lineno3.0 lineno3.0.stdout
 FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		local3.0
 FILES+=		local4.0
 FILES+=		local5.0
 FILES+=		local6.0
 FILES+=		local7.0
 .if ${MK_NLS} != "no"
 FILES+=		locale1.0
 .endif
 FILES+=		printf1.0
 FILES+=		printf2.0
 FILES+=		printf3.0
 FILES+=		printf4.0
 FILES+=		read1.0 read1.0.stdout
 FILES+=		read2.0
 FILES+=		read3.0 read3.0.stdout
 FILES+=		read4.0 read4.0.stdout
 FILES+=		read5.0
 FILES+=		read6.0
 FILES+=		read7.0
 FILES+=		read8.0
 FILES+=		read9.0
 FILES+=		return1.0
 FILES+=		return2.1
 FILES+=		return3.1
 FILES+=		return4.0
 FILES+=		return5.0
 FILES+=		return6.4
 FILES+=		return7.4
 FILES+=		return8.0
 FILES+=		set1.0
 FILES+=		set2.0
 FILES+=		trap1.0
 FILES+=		trap10.0
 FILES+=		trap11.0
 FILES+=		trap12.0
 FILES+=		trap13.0
 FILES+=		trap14.0
 FILES+=		trap15.0
 FILES+=		trap16.0
 FILES+=		trap2.0
 FILES+=		trap3.0
 FILES+=		trap4.0
 FILES+=		trap5.0
 FILES+=		trap6.0
 FILES+=		trap7.0
 FILES+=		trap8.0
 FILES+=		trap9.0
 FILES+=		type1.0 type1.0.stderr
 FILES+=		type2.0
 FILES+=		type3.0
 FILES+=		unalias.0
 FILES+=		var-assign.0
 FILES+=		var-assign2.0
 FILES+=		wait1.0
 FILES+=		wait2.0
 FILES+=		wait3.0
 FILES+=		wait4.0
 FILES+=		wait5.0
 FILES+=		wait6.0
 FILES+=		wait7.0
 FILES+=		wait8.0
 FILES+=		wait9.127
 FILES+=		wait10.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/errors/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/errors/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/errors/Makefile	(revision 295215)
@@ -1,38 +1,37 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		assignment-error1.0
 FILES+=		assignment-error2.0
 FILES+=		backquote-error1.0
 FILES+=		backquote-error2.0
 FILES+=		bad-binary1.126
 FILES+=		bad-keyword1.0
 FILES+=		bad-parm-exp1.0
 FILES+=		bad-parm-exp2.2 bad-parm-exp2.2.stderr
 FILES+=		bad-parm-exp3.2 bad-parm-exp3.2.stderr
 FILES+=		bad-parm-exp4.2 bad-parm-exp4.2.stderr
 FILES+=		bad-parm-exp5.2 bad-parm-exp5.2.stderr
 FILES+=		bad-parm-exp6.2 bad-parm-exp6.2.stderr
 FILES+=		bad-parm-exp7.0
 FILES+=		bad-parm-exp8.0
 FILES+=		option-error.0
 FILES+=		redirection-error.0
 FILES+=		redirection-error2.2
 FILES+=		redirection-error3.0
 FILES+=		redirection-error4.0
 FILES+=		redirection-error5.0
 FILES+=		redirection-error6.0
 FILES+=		redirection-error7.0
 FILES+=		write-error1.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/execution/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/execution/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/execution/Makefile	(revision 295215)
@@ -1,60 +1,59 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		bg1.0
 FILES+=		bg2.0
 FILES+=		bg3.0
 FILES+=		bg4.0
 FILES+=		bg5.0
 FILES+=		bg6.0 bg6.0.stdout
 FILES+=		bg7.0
 FILES+=		bg8.0
 FILES+=		bg9.0
 FILES+=		bg10.0 bg10.0.stdout
 FILES+=		fork1.0
 FILES+=		fork2.0
 FILES+=		fork3.0
 FILES+=		func1.0
 FILES+=		func2.0
 FILES+=		func3.0
 FILES+=		hash1.0
 FILES+=		int-cmd1.0
 FILES+=		killed1.0
 FILES+=		killed2.0
 FILES+=		not1.0
 FILES+=		not2.0
 FILES+=		path1.0
 FILES+=		redir1.0
 FILES+=		redir2.0
 FILES+=		redir3.0
 FILES+=		redir4.0
 FILES+=		redir5.0
 FILES+=		redir6.0
 FILES+=		redir7.0
 FILES+=		set-n1.0
 FILES+=		set-n2.0
 FILES+=		set-n3.0
 FILES+=		set-n4.0
 FILES+=		set-x1.0
 FILES+=		set-x2.0
 FILES+=		set-x3.0
 FILES+=		set-x4.0
 FILES+=		shellproc1.0
 FILES+=		subshell1.0 subshell1.0.stdout
 FILES+=		subshell2.0
 FILES+=		subshell3.0
 FILES+=		subshell4.0
 FILES+=		unknown1.0
 FILES+=		var-assign1.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/expansion/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/expansion/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/expansion/Makefile	(revision 295215)
@@ -1,99 +1,98 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		arith1.0
 FILES+=		arith2.0
 FILES+=		arith3.0
 FILES+=		arith4.0
 FILES+=		arith5.0
 FILES+=		arith6.0
 FILES+=		arith7.0
 FILES+=		arith8.0
 FILES+=		arith9.0
 FILES+=		arith10.0
 FILES+=		arith11.0
 FILES+=		arith12.0
 FILES+=		arith13.0
 FILES+=		arith14.0
 FILES+=		assign1.0
 FILES+=		cmdsubst1.0
 FILES+=		cmdsubst2.0
 FILES+=		cmdsubst3.0
 FILES+=		cmdsubst4.0
 FILES+=		cmdsubst5.0
 FILES+=		cmdsubst6.0
 FILES+=		cmdsubst7.0
 FILES+=		cmdsubst8.0
 FILES+=		cmdsubst9.0
 FILES+=		cmdsubst10.0
 FILES+=		cmdsubst11.0
 FILES+=		cmdsubst12.0
 FILES+=		cmdsubst13.0
 FILES+=		cmdsubst14.0
 FILES+=		cmdsubst15.0
 FILES+=		cmdsubst16.0
 FILES+=		cmdsubst17.0
 FILES+=		export1.0
 FILES+=		export2.0
 FILES+=		export3.0
 FILES+=		heredoc1.0
 FILES+=		heredoc2.0
 FILES+=		ifs1.0
 FILES+=		ifs2.0
 FILES+=		ifs3.0
 FILES+=		ifs4.0
 FILES+=		ifs5.0
 FILES+=		ifs6.0
 FILES+=		ifs7.0
 FILES+=		length1.0
 FILES+=		length2.0
 FILES+=		length3.0
 FILES+=		length4.0
 FILES+=		length5.0
 FILES+=		length6.0
 FILES+=		length7.0
 FILES+=		length8.0
 FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		pathname1.0
 FILES+=		pathname2.0
 FILES+=		pathname3.0
 FILES+=		pathname4.0
 FILES+=		pathname5.0
 FILES+=		plus-minus1.0
 FILES+=		plus-minus2.0
 FILES+=		plus-minus3.0
 FILES+=		plus-minus4.0
 FILES+=		plus-minus5.0
 FILES+=		plus-minus6.0
 FILES+=		plus-minus7.0
 FILES+=		plus-minus8.0
 FILES+=		question1.0
 FILES+=		readonly1.0
 FILES+=		redir1.0
 FILES+=		set-u1.0
 FILES+=		set-u2.0
 FILES+=		set-u3.0
 FILES+=		tilde1.0
 FILES+=		tilde2.0
 FILES+=		trim1.0
 FILES+=		trim2.0
 FILES+=		trim3.0
 FILES+=		trim4.0
 FILES+=		trim5.0
 FILES+=		trim6.0
 FILES+=		trim7.0
 FILES+=		trim8.0
 FILES+=		trim9.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/parameters/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/parameters/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/parameters/Makefile	(revision 295215)
@@ -1,32 +1,31 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		env1.0
 FILES+=		exitstatus1.0
 FILES+=		mail1.0
 FILES+=		mail2.0
 FILES+=		optind1.0
 FILES+=		optind2.0
 FILES+=		positional1.0
 FILES+=		positional2.0
 FILES+=		positional3.0
 FILES+=		positional4.0
 FILES+=		positional5.0
 FILES+=		positional6.0
 FILES+=		positional7.0
 FILES+=		positional8.0
 FILES+=		positional9.0
 FILES+=		pwd1.0
 FILES+=		pwd2.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/parser/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile	(revision 295215)
@@ -1,85 +1,84 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		alias1.0
 FILES+=		alias2.0
 FILES+=		alias3.0
 FILES+=		alias4.0
 FILES+=		alias5.0
 FILES+=		alias6.0
 FILES+=		alias7.0
 FILES+=		alias8.0
 FILES+=		alias9.0
 FILES+=		alias10.0
 FILES+=		alias11.0
 FILES+=		alias12.0
 FILES+=		alias13.0
 FILES+=		alias14.0
 FILES+=		alias15.0 alias15.0.stdout
 FILES+=		and-pipe-not.0
 FILES+=		case1.0
 FILES+=		case2.0
 FILES+=		dollar-quote1.0
 FILES+=		dollar-quote2.0
 FILES+=		dollar-quote3.0
 FILES+=		dollar-quote4.0
 FILES+=		dollar-quote5.0
 FILES+=		dollar-quote6.0
 FILES+=		dollar-quote7.0
 FILES+=		dollar-quote8.0
 FILES+=		dollar-quote9.0
 FILES+=		dollar-quote10.0
 FILES+=		dollar-quote11.0
 FILES+=		dollar-quote12.0
 FILES+=		dollar-quote13.0
 FILES+=		empty-braces1.0
 FILES+=		empty-cmd1.0
 FILES+=		for1.0
 FILES+=		for2.0
 FILES+=		func1.0
 FILES+=		func2.0
 FILES+=		func3.0
 FILES+=		heredoc1.0
 FILES+=		heredoc2.0
 FILES+=		heredoc3.0
 FILES+=		heredoc4.0
 FILES+=		heredoc5.0
 FILES+=		heredoc6.0
 FILES+=		heredoc7.0
 FILES+=		heredoc8.0
 FILES+=		heredoc9.0
 FILES+=		heredoc10.0
 FILES+=		heredoc11.0
 FILES+=		heredoc12.0
 FILES+=		heredoc13.0
 FILES+=		line-cont1.0
 FILES+=		line-cont2.0
 FILES+=		line-cont3.0
 FILES+=		line-cont4.0
 FILES+=		line-cont5.0
 FILES+=		line-cont6.0
 FILES+=		line-cont7.0
 FILES+=		line-cont8.0
 FILES+=		line-cont9.0
 FILES+=		line-cont10.0
 FILES+=		line-cont11.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
 FILES+=		only-redir1.0
 FILES+=		only-redir2.0
 FILES+=		only-redir3.0
 FILES+=		only-redir4.0
 FILES+=		pipe-not1.0
 FILES+=		var-assign1.0
 
 .include <bsd.test.mk>
Index: projects/release-pkg/bin/sh/tests/set-e/Makefile
===================================================================
--- projects/release-pkg/bin/sh/tests/set-e/Makefile	(revision 295214)
+++ projects/release-pkg/bin/sh/tests/set-e/Makefile	(revision 295215)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		and1.0
 FILES+=		and2.1
 FILES+=		and3.0
 FILES+=		and4.0
 FILES+=		background1.0
 FILES+=		cmd1.0
 FILES+=		cmd2.1
 FILES+=		elif1.0
 FILES+=		elif2.0
 FILES+=		eval1.0
 FILES+=		eval2.1
 FILES+=		for1.0
 FILES+=		func1.0
 FILES+=		func2.1
 FILES+=		if1.0
 FILES+=		if2.0
 FILES+=		if3.0
 FILES+=		not1.0
 FILES+=		not2.0
 FILES+=		or1.0
 FILES+=		or2.0
 FILES+=		or3.1
 FILES+=		pipe1.1
 FILES+=		pipe2.0
 FILES+=		return1.0
 FILES+=		semi1.1
 FILES+=		semi2.1
 FILES+=		subshell1.0
 FILES+=		subshell2.1
 FILES+=		until1.0
 FILES+=		until2.0
 FILES+=		until3.0
 FILES+=		while1.0
 FILES+=		while2.0
 FILES+=		while3.0
 
 .include <bsd.test.mk>