svn commit: r299012 - in user/ngie/release-pkg-fix-tests: bin/cat/tests bin/date/tests bin/dd/tests bin/expr/tests bin/ls/tests bin/mv/tests bin/pax/tests bin/pkill/tests bin/sh/tests bin/sh/tests/...
Garrett Cooper
ngie at FreeBSD.org
Tue May 3 23:24:17 UTC 2016
Author: ngie
Date: Tue May 3 23:24:14 2016
New Revision: 299012
URL: https://svnweb.freebsd.org/changeset/base/299012
Log:
Checkpoint next iteration for fixing tests after the release packaging merge
On reflection, using TESTS was a bit too opportunistic; I'd rather not break
things unexpectedly in downstream consumers.
In particular:
- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
namespacing is kept with FILES appropriately, and that this shouldn't need
to be repeated if the namespace changes -- only the definition of PACKAGE
needs to be changed
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
${PACKAGE}FILESDIR is now defined in bsd.test.mk.
- Remove unnecessary .include <bsd.own.mk>'s
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
and lib/libc/tests/net/getaddrinfo
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
`tests`. In the event we get to the point where things can be split up
enough in the base system, it would make more sense to group the tests
with the blocks they're a part of, e.g. byacc with byacc-tests, etc
Modified:
user/ngie/release-pkg-fix-tests/bin/cat/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/date/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/dd/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/expr/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/ls/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/mv/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/pax/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/pkill/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/builtins/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/errors/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/execution/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/expansion/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/parameters/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/parser/Makefile
user/ngie/release-pkg-fix-tests/bin/sh/tests/set-e/Makefile
user/ngie/release-pkg-fix-tests/bin/sleep/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/test/tests/Makefile
user/ngie/release-pkg-fix-tests/bin/tests/Makefile
user/ngie/release-pkg-fix-tests/cddl/lib/tests/Makefile
user/ngie/release-pkg-fix-tests/cddl/sbin/tests/Makefile
user/ngie/release-pkg-fix-tests/cddl/tests/Makefile
user/ngie/release-pkg-fix-tests/cddl/usr.bin/tests/Makefile
user/ngie/release-pkg-fix-tests/cddl/usr.sbin/tests/Makefile
user/ngie/release-pkg-fix-tests/gnu/lib/tests/Makefile
user/ngie/release-pkg-fix-tests/gnu/tests/Makefile
user/ngie/release-pkg-fix-tests/gnu/usr.bin/diff/tests/Makefile
user/ngie/release-pkg-fix-tests/gnu/usr.bin/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/atf/libatf-c++/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/atf/libatf-c++/tests/detail/Makefile
user/ngie/release-pkg-fix-tests/lib/atf/libatf-c/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/atf/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/atf/tests/test-programs/Makefile
user/ngie/release-pkg-fix-tests/lib/libarchive/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/c063/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/db/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/gen/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/gen/execve/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/gen/posix_spawn/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/hash/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/inet/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/locale/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/net/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/net/getaddrinfo/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/nss/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/regex/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/resolv/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/rpc/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/setjmp/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/ssp/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/stdio/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/stdlib/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/string/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/sys/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/termios/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/time/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/tls/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/tls/dso/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/tls_dso/Makefile
user/ngie/release-pkg-fix-tests/lib/libc/tests/ttyio/Makefile
user/ngie/release-pkg-fix-tests/lib/libcrypt/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libmp/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libnv/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libpam/libpam/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libproc/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/librt/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libthr/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libthr/tests/dlopen/Makefile
user/ngie/release-pkg-fix-tests/lib/libthr/tests/dlopen/dso/Makefile
user/ngie/release-pkg-fix-tests/lib/libutil/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libxo/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/libxo/tests/encoder/Makefile
user/ngie/release-pkg-fix-tests/lib/msun/tests/Makefile
user/ngie/release-pkg-fix-tests/lib/tests/Makefile
user/ngie/release-pkg-fix-tests/libexec/atf/atf-check/tests/Makefile
user/ngie/release-pkg-fix-tests/libexec/atf/tests/Makefile
user/ngie/release-pkg-fix-tests/libexec/rtld-elf/tests/Makefile
user/ngie/release-pkg-fix-tests/libexec/rtld-elf/tests/libpythagoras/Makefile
user/ngie/release-pkg-fix-tests/libexec/rtld-elf/tests/target/Makefile
user/ngie/release-pkg-fix-tests/libexec/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/devd/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/dhclient/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/growfs/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/ifconfig/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/mdconfig/tests/Makefile
user/ngie/release-pkg-fix-tests/sbin/tests/Makefile
user/ngie/release-pkg-fix-tests/secure/lib/tests/Makefile
user/ngie/release-pkg-fix-tests/secure/libexec/tests/Makefile
user/ngie/release-pkg-fix-tests/secure/tests/Makefile
user/ngie/release-pkg-fix-tests/secure/usr.bin/tests/Makefile
user/ngie/release-pkg-fix-tests/secure/usr.sbin/tests/Makefile
user/ngie/release-pkg-fix-tests/share/examples/tests/Makefile
user/ngie/release-pkg-fix-tests/share/examples/tests/tests/Makefile
user/ngie/release-pkg-fix-tests/share/mk/bsd.test.mk
user/ngie/release-pkg-fix-tests/share/mk/suite.test.mk
user/ngie/release-pkg-fix-tests/share/tests/Makefile
user/ngie/release-pkg-fix-tests/sys/modules/tests/callout_test/Makefile
user/ngie/release-pkg-fix-tests/sys/modules/tests/framework/Makefile
user/ngie/release-pkg-fix-tests/tests/Makefile
user/ngie/release-pkg-fix-tests/tests/etc/rc.d/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/acl/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/aio/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/fifo/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/file/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/concat/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/eli/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/gate/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/mirror/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/nop/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/raid3/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/shsec/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/stripe/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/geom/class/uzip/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/kern/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/kern/acct/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/kern/execve/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/kqueue/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/mac/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/mac/bsdextended/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/mac/portacl/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/mqueue/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/netinet/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/opencrypto/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/pjdfstest/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/chflags/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/chmod/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/chown/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/ftruncate/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/granular/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/link/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/mkdir/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/mkfifo/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/mknod/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/open/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/rename/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/rmdir/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/symlink/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/truncate/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/pjdfstest/tests/unlink/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/posixshm/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/vfs/Makefile
user/ngie/release-pkg-fix-tests/tests/sys/vm/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/apply/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/basename/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/archives/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/basic/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/basic/t0/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/basic/t1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/basic/t2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/basic/t3/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/execution/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/execution/ellipsis/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/execution/empty/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/execution/joberr/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/execution/plus/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/builtin/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/meta/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/path/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/path_select/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/replace/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/shell/select/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/suffixes/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/suffixes/basic/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/syntax/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/syntax/directive-t0/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/syntax/enl/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/syntax/funny-targets/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/syntax/semi/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t0/2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t0/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t1/2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t2/2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t2/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/variables/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/variables/modifier_M/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/variables/modifier_t/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/variables/opt_V/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/bmake/tests/variables/t0/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/calendar/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/cmp/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/col/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/comm/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/cpio/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/cut/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/dirname/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/file2c/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/grep/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/gzip/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/ident/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/join/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/jot/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/lastcomm/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/limits/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/m4/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/mkimg/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/ncal/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/printf/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/sdiff/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/sed/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/sed/tests/regress.multitest.out/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/soelim/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/tar/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/timeout/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/tr/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/truncate/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/units/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/uudecode/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/uuencode/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/xargs/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/xo/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.bin/yacc/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/chown/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/etcupdate/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/extattr/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/fstyp/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/makefs/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/newsyslog/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/nmtree/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/pw/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/rpcbind/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/sa/tests/Makefile
user/ngie/release-pkg-fix-tests/usr.sbin/tests/Makefile
Modified: user/ngie/release-pkg-fix-tests/bin/cat/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/cat/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/cat/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,15 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
NETBSD_ATF_TESTS_SH= cat_test
-FILESDIR= ${TESTSDIR}
-
-FILES= d_align.in
-FILES+= d_align.out
+${PACKAGE}FILES+= d_align.in
+${PACKAGE}FILES+= d_align.out
.include <netbsd-tests.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/date/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/date/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/date/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,11 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH= format_string_test
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/dd/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/dd/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/dd/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= dd_test
.include <netbsd-tests.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/expr/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/expr/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/expr/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= expr_test
ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g'
Modified: user/ngie/release-pkg-fix-tests/bin/ls/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/ls/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/ls/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH+= ls_tests
# This seems like overkill, but the idea in mind is that all of the testcases
# should be runnable as !root
Modified: user/ngie/release-pkg-fix-tests/bin/mv/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/mv/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/mv/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= legacy_test
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/pax/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/pax/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/pax/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/pkill/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/pkill/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/pkill/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= pgrep-F_test
TAP_TESTS_SH+= pgrep-LF_test
TAP_TESTS_SH+= pgrep-P_test
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TESTS_SUBDIRS+= builtins
TESTS_SUBDIRS+= errors
TESTS_SUBDIRS+= execution
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/builtins/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/builtins/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/builtins/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,178 +1,178 @@
# $FreeBSD$
+PACKAGE= tests
+
.include <src.opts.mk>
-PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= alias.0 alias.0.stdout
-TESTS+= alias.1 alias.1.stderr
-TESTS+= alias3.0 alias3.0.stdout
-TESTS+= alias4.0
-TESTS+= break1.0
-TESTS+= break2.0 break2.0.stdout
-TESTS+= break3.0
-TESTS+= break4.4
-TESTS+= break5.4
-TESTS+= break6.0
-TESTS+= builtin1.0
-TESTS+= case1.0
-TESTS+= case2.0
-TESTS+= case3.0
-TESTS+= case4.0
-TESTS+= case5.0
-TESTS+= case6.0
-TESTS+= case7.0
-TESTS+= case8.0
-TESTS+= case9.0
-TESTS+= case10.0
-TESTS+= case11.0
-TESTS+= case12.0
-TESTS+= case13.0
-TESTS+= case14.0
-TESTS+= case15.0
-TESTS+= case16.0
-TESTS+= case17.0
-TESTS+= case18.0
-TESTS+= case19.0
-TESTS+= case20.0
-TESTS+= cd1.0
-TESTS+= cd2.0
-TESTS+= cd3.0
-TESTS+= cd4.0
-TESTS+= cd5.0
-TESTS+= cd6.0
-TESTS+= cd7.0
-TESTS+= cd8.0
-TESTS+= cd9.0 cd9.0.stdout
-TESTS+= command1.0
-TESTS+= command2.0
-TESTS+= command3.0
-TESTS+= command3.0.stdout
-TESTS+= command4.0
-TESTS+= command5.0
-TESTS+= command5.0.stdout
-TESTS+= command6.0
-TESTS+= command6.0.stdout
-TESTS+= command7.0
-TESTS+= command8.0
-TESTS+= command9.0
-TESTS+= command10.0
-TESTS+= command11.0
-TESTS+= command12.0
-TESTS+= dot1.0
-TESTS+= dot2.0
-TESTS+= dot3.0
-TESTS+= dot4.0
-TESTS+= eval1.0
-TESTS+= eval2.0
-TESTS+= eval3.0
-TESTS+= eval4.0
-TESTS+= eval5.0
-TESTS+= eval6.0
-TESTS+= eval7.0
-TESTS+= eval8.7
-TESTS+= exec1.0
-TESTS+= exec2.0
-TESTS+= exit1.0
-TESTS+= exit2.8
-TESTS+= exit3.0
-TESTS+= export1.0
-TESTS+= fc1.0
-TESTS+= fc2.0
-TESTS+= for1.0
-TESTS+= for2.0
-TESTS+= for3.0
-TESTS+= getopts1.0 getopts1.0.stdout
-TESTS+= getopts2.0 getopts2.0.stdout
-TESTS+= getopts3.0
-TESTS+= getopts4.0
-TESTS+= getopts5.0
-TESTS+= getopts6.0
-TESTS+= getopts7.0
-TESTS+= getopts8.0 getopts8.0.stdout
-TESTS+= getopts9.0 getopts9.0.stdout
-TESTS+= getopts10.0
-TESTS+= hash1.0 hash1.0.stdout
-TESTS+= hash2.0 hash2.0.stdout
-TESTS+= hash3.0 hash3.0.stdout
-TESTS+= hash4.0
-TESTS+= jobid1.0
-TESTS+= jobid2.0
-TESTS+= kill1.0 kill2.0
-TESTS+= lineno.0 lineno.0.stdout
-TESTS+= lineno2.0
-TESTS+= lineno3.0 lineno3.0.stdout
-TESTS+= local1.0
-TESTS+= local2.0
-TESTS+= local3.0
-TESTS+= local4.0
-TESTS+= local5.0
-TESTS+= local6.0
-TESTS+= local7.0
+${PACKAGE}FILES+= alias.0 alias.0.stdout
+${PACKAGE}FILES+= alias.1 alias.1.stderr
+${PACKAGE}FILES+= alias3.0 alias3.0.stdout
+${PACKAGE}FILES+= alias4.0
+${PACKAGE}FILES+= break1.0
+${PACKAGE}FILES+= break2.0 break2.0.stdout
+${PACKAGE}FILES+= break3.0
+${PACKAGE}FILES+= break4.4
+${PACKAGE}FILES+= break5.4
+${PACKAGE}FILES+= break6.0
+${PACKAGE}FILES+= builtin1.0
+${PACKAGE}FILES+= case1.0
+${PACKAGE}FILES+= case2.0
+${PACKAGE}FILES+= case3.0
+${PACKAGE}FILES+= case4.0
+${PACKAGE}FILES+= case5.0
+${PACKAGE}FILES+= case6.0
+${PACKAGE}FILES+= case7.0
+${PACKAGE}FILES+= case8.0
+${PACKAGE}FILES+= case9.0
+${PACKAGE}FILES+= case10.0
+${PACKAGE}FILES+= case11.0
+${PACKAGE}FILES+= case12.0
+${PACKAGE}FILES+= case13.0
+${PACKAGE}FILES+= case14.0
+${PACKAGE}FILES+= case15.0
+${PACKAGE}FILES+= case16.0
+${PACKAGE}FILES+= case17.0
+${PACKAGE}FILES+= case18.0
+${PACKAGE}FILES+= case19.0
+${PACKAGE}FILES+= case20.0
+${PACKAGE}FILES+= cd1.0
+${PACKAGE}FILES+= cd2.0
+${PACKAGE}FILES+= cd3.0
+${PACKAGE}FILES+= cd4.0
+${PACKAGE}FILES+= cd5.0
+${PACKAGE}FILES+= cd6.0
+${PACKAGE}FILES+= cd7.0
+${PACKAGE}FILES+= cd8.0
+${PACKAGE}FILES+= cd9.0 cd9.0.stdout
+${PACKAGE}FILES+= command1.0
+${PACKAGE}FILES+= command2.0
+${PACKAGE}FILES+= command3.0
+${PACKAGE}FILES+= command3.0.stdout
+${PACKAGE}FILES+= command4.0
+${PACKAGE}FILES+= command5.0
+${PACKAGE}FILES+= command5.0.stdout
+${PACKAGE}FILES+= command6.0
+${PACKAGE}FILES+= command6.0.stdout
+${PACKAGE}FILES+= command7.0
+${PACKAGE}FILES+= command8.0
+${PACKAGE}FILES+= command9.0
+${PACKAGE}FILES+= command10.0
+${PACKAGE}FILES+= command11.0
+${PACKAGE}FILES+= command12.0
+${PACKAGE}FILES+= dot1.0
+${PACKAGE}FILES+= dot2.0
+${PACKAGE}FILES+= dot3.0
+${PACKAGE}FILES+= dot4.0
+${PACKAGE}FILES+= eval1.0
+${PACKAGE}FILES+= eval2.0
+${PACKAGE}FILES+= eval3.0
+${PACKAGE}FILES+= eval4.0
+${PACKAGE}FILES+= eval5.0
+${PACKAGE}FILES+= eval6.0
+${PACKAGE}FILES+= eval7.0
+${PACKAGE}FILES+= eval8.7
+${PACKAGE}FILES+= exec1.0
+${PACKAGE}FILES+= exec2.0
+${PACKAGE}FILES+= exit1.0
+${PACKAGE}FILES+= exit2.8
+${PACKAGE}FILES+= exit3.0
+${PACKAGE}FILES+= export1.0
+${PACKAGE}FILES+= fc1.0
+${PACKAGE}FILES+= fc2.0
+${PACKAGE}FILES+= for1.0
+${PACKAGE}FILES+= for2.0
+${PACKAGE}FILES+= for3.0
+${PACKAGE}FILES+= getopts1.0 getopts1.0.stdout
+${PACKAGE}FILES+= getopts2.0 getopts2.0.stdout
+${PACKAGE}FILES+= getopts3.0
+${PACKAGE}FILES+= getopts4.0
+${PACKAGE}FILES+= getopts5.0
+${PACKAGE}FILES+= getopts6.0
+${PACKAGE}FILES+= getopts7.0
+${PACKAGE}FILES+= getopts8.0 getopts8.0.stdout
+${PACKAGE}FILES+= getopts9.0 getopts9.0.stdout
+${PACKAGE}FILES+= getopts10.0
+${PACKAGE}FILES+= hash1.0 hash1.0.stdout
+${PACKAGE}FILES+= hash2.0 hash2.0.stdout
+${PACKAGE}FILES+= hash3.0 hash3.0.stdout
+${PACKAGE}FILES+= hash4.0
+${PACKAGE}FILES+= jobid1.0
+${PACKAGE}FILES+= jobid2.0
+${PACKAGE}FILES+= kill1.0 kill2.0
+${PACKAGE}FILES+= lineno.0 lineno.0.stdout
+${PACKAGE}FILES+= lineno2.0
+${PACKAGE}FILES+= lineno3.0 lineno3.0.stdout
+${PACKAGE}FILES+= local1.0
+${PACKAGE}FILES+= local2.0
+${PACKAGE}FILES+= local3.0
+${PACKAGE}FILES+= local4.0
+${PACKAGE}FILES+= local5.0
+${PACKAGE}FILES+= local6.0
+${PACKAGE}FILES+= local7.0
.if ${MK_NLS} != "no"
-TESTS+= locale1.0
+${PACKAGE}FILES+= locale1.0
.endif
-TESTS+= printf1.0
-TESTS+= printf2.0
-TESTS+= printf3.0
-TESTS+= printf4.0
-TESTS+= read1.0 read1.0.stdout
-TESTS+= read2.0
-TESTS+= read3.0 read3.0.stdout
-TESTS+= read4.0 read4.0.stdout
-TESTS+= read5.0
-TESTS+= read6.0
-TESTS+= read7.0
-TESTS+= read8.0
-TESTS+= read9.0
-TESTS+= return1.0
-TESTS+= return2.1
-TESTS+= return3.1
-TESTS+= return4.0
-TESTS+= return5.0
-TESTS+= return6.4
-TESTS+= return7.4
-TESTS+= return8.0
-TESTS+= set1.0
-TESTS+= set2.0
-TESTS+= set3.0
-TESTS+= trap1.0
-TESTS+= trap10.0
-TESTS+= trap11.0
-TESTS+= trap12.0
-TESTS+= trap13.0
-TESTS+= trap14.0
-TESTS+= trap15.0
-TESTS+= trap16.0
-TESTS+= trap17.0
-TESTS+= trap2.0
-TESTS+= trap3.0
-TESTS+= trap4.0
-TESTS+= trap5.0
-TESTS+= trap6.0
-TESTS+= trap7.0
-TESTS+= trap8.0
-TESTS+= trap9.0
-TESTS+= type1.0 type1.0.stderr
-TESTS+= type2.0
-TESTS+= type3.0
-TESTS+= unalias.0
-TESTS+= var-assign.0
-TESTS+= var-assign2.0
-TESTS+= wait1.0
-TESTS+= wait2.0
-TESTS+= wait3.0
-TESTS+= wait4.0
-TESTS+= wait5.0
-TESTS+= wait6.0
-TESTS+= wait7.0
-TESTS+= wait8.0
-TESTS+= wait9.127
-TESTS+= wait10.0
+${PACKAGE}FILES+= printf1.0
+${PACKAGE}FILES+= printf2.0
+${PACKAGE}FILES+= printf3.0
+${PACKAGE}FILES+= printf4.0
+${PACKAGE}FILES+= read1.0 read1.0.stdout
+${PACKAGE}FILES+= read2.0
+${PACKAGE}FILES+= read3.0 read3.0.stdout
+${PACKAGE}FILES+= read4.0 read4.0.stdout
+${PACKAGE}FILES+= read5.0
+${PACKAGE}FILES+= read6.0
+${PACKAGE}FILES+= read7.0
+${PACKAGE}FILES+= read8.0
+${PACKAGE}FILES+= read9.0
+${PACKAGE}FILES+= return1.0
+${PACKAGE}FILES+= return2.1
+${PACKAGE}FILES+= return3.1
+${PACKAGE}FILES+= return4.0
+${PACKAGE}FILES+= return5.0
+${PACKAGE}FILES+= return6.4
+${PACKAGE}FILES+= return7.4
+${PACKAGE}FILES+= return8.0
+${PACKAGE}FILES+= set1.0
+${PACKAGE}FILES+= set2.0
+${PACKAGE}FILES+= set3.0
+${PACKAGE}FILES+= trap1.0
+${PACKAGE}FILES+= trap10.0
+${PACKAGE}FILES+= trap11.0
+${PACKAGE}FILES+= trap12.0
+${PACKAGE}FILES+= trap13.0
+${PACKAGE}FILES+= trap14.0
+${PACKAGE}FILES+= trap15.0
+${PACKAGE}FILES+= trap16.0
+${PACKAGE}FILES+= trap17.0
+${PACKAGE}FILES+= trap2.0
+${PACKAGE}FILES+= trap3.0
+${PACKAGE}FILES+= trap4.0
+${PACKAGE}FILES+= trap5.0
+${PACKAGE}FILES+= trap6.0
+${PACKAGE}FILES+= trap7.0
+${PACKAGE}FILES+= trap8.0
+${PACKAGE}FILES+= trap9.0
+${PACKAGE}FILES+= type1.0 type1.0.stderr
+${PACKAGE}FILES+= type2.0
+${PACKAGE}FILES+= type3.0
+${PACKAGE}FILES+= unalias.0
+${PACKAGE}FILES+= var-assign.0
+${PACKAGE}FILES+= var-assign2.0
+${PACKAGE}FILES+= wait1.0
+${PACKAGE}FILES+= wait2.0
+${PACKAGE}FILES+= wait3.0
+${PACKAGE}FILES+= wait4.0
+${PACKAGE}FILES+= wait5.0
+${PACKAGE}FILES+= wait6.0
+${PACKAGE}FILES+= wait7.0
+${PACKAGE}FILES+= wait8.0
+${PACKAGE}FILES+= wait9.127
+${PACKAGE}FILES+= wait10.0
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/errors/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/errors/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/errors/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,34 +1,34 @@
# $FreeBSD$
PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= assignment-error1.0
-TESTS+= assignment-error2.0
-TESTS+= backquote-error1.0
-TESTS+= backquote-error2.0
-TESTS+= bad-binary1.126
-TESTS+= bad-keyword1.0
-TESTS+= bad-parm-exp1.0
-TESTS+= bad-parm-exp2.2 bad-parm-exp2.2.stderr
-TESTS+= bad-parm-exp3.2 bad-parm-exp3.2.stderr
-TESTS+= bad-parm-exp4.2 bad-parm-exp4.2.stderr
-TESTS+= bad-parm-exp5.2 bad-parm-exp5.2.stderr
-TESTS+= bad-parm-exp6.2 bad-parm-exp6.2.stderr
-TESTS+= bad-parm-exp7.0
-TESTS+= bad-parm-exp8.0
-TESTS+= option-error.0
-TESTS+= redirection-error.0
-TESTS+= redirection-error2.2
-TESTS+= redirection-error3.0
-TESTS+= redirection-error4.0
-TESTS+= redirection-error5.0
-TESTS+= redirection-error6.0
-TESTS+= redirection-error7.0
-TESTS+= write-error1.0
+${PACKAGE}FILES+= assignment-error1.0
+${PACKAGE}FILES+= assignment-error2.0
+${PACKAGE}FILES+= backquote-error1.0
+${PACKAGE}FILES+= backquote-error2.0
+${PACKAGE}FILES+= bad-binary1.126
+${PACKAGE}FILES+= bad-keyword1.0
+${PACKAGE}FILES+= bad-parm-exp1.0
+${PACKAGE}FILES+= bad-parm-exp2.2 bad-parm-exp2.2.stderr
+${PACKAGE}FILES+= bad-parm-exp3.2 bad-parm-exp3.2.stderr
+${PACKAGE}FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr
+${PACKAGE}FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr
+${PACKAGE}FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr
+${PACKAGE}FILES+= bad-parm-exp7.0
+${PACKAGE}FILES+= bad-parm-exp8.0
+${PACKAGE}FILES+= option-error.0
+${PACKAGE}FILES+= redirection-error.0
+${PACKAGE}FILES+= redirection-error2.2
+${PACKAGE}FILES+= redirection-error3.0
+${PACKAGE}FILES+= redirection-error4.0
+${PACKAGE}FILES+= redirection-error5.0
+${PACKAGE}FILES+= redirection-error6.0
+${PACKAGE}FILES+= redirection-error7.0
+${PACKAGE}FILES+= write-error1.0
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/execution/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/execution/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/execution/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,56 +1,56 @@
# $FreeBSD$
PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= bg1.0
-TESTS+= bg2.0
-TESTS+= bg3.0
-TESTS+= bg4.0
-TESTS+= bg5.0
-TESTS+= bg6.0 bg6.0.stdout
-TESTS+= bg7.0
-TESTS+= bg8.0
-TESTS+= bg9.0
-TESTS+= bg10.0 bg10.0.stdout
-TESTS+= fork1.0
-TESTS+= fork2.0
-TESTS+= fork3.0
-TESTS+= func1.0
-TESTS+= func2.0
-TESTS+= func3.0
-TESTS+= hash1.0
-TESTS+= int-cmd1.0
-TESTS+= killed1.0
-TESTS+= killed2.0
-TESTS+= not1.0
-TESTS+= not2.0
-TESTS+= path1.0
-TESTS+= redir1.0
-TESTS+= redir2.0
-TESTS+= redir3.0
-TESTS+= redir4.0
-TESTS+= redir5.0
-TESTS+= redir6.0
-TESTS+= redir7.0
-TESTS+= set-n1.0
-TESTS+= set-n2.0
-TESTS+= set-n3.0
-TESTS+= set-n4.0
-TESTS+= set-x1.0
-TESTS+= set-x2.0
-TESTS+= set-x3.0
-TESTS+= set-x4.0
-TESTS+= shellproc1.0
-TESTS+= subshell1.0 subshell1.0.stdout
-TESTS+= subshell2.0
-TESTS+= subshell3.0
-TESTS+= subshell4.0
-TESTS+= unknown1.0
-TESTS+= var-assign1.0
+${PACKAGE}FILES+= bg1.0
+${PACKAGE}FILES+= bg2.0
+${PACKAGE}FILES+= bg3.0
+${PACKAGE}FILES+= bg4.0
+${PACKAGE}FILES+= bg5.0
+${PACKAGE}FILES+= bg6.0 bg6.0.stdout
+${PACKAGE}FILES+= bg7.0
+${PACKAGE}FILES+= bg8.0
+${PACKAGE}FILES+= bg9.0
+${PACKAGE}FILES+= bg10.0 bg10.0.stdout
+${PACKAGE}FILES+= fork1.0
+${PACKAGE}FILES+= fork2.0
+${PACKAGE}FILES+= fork3.0
+${PACKAGE}FILES+= func1.0
+${PACKAGE}FILES+= func2.0
+${PACKAGE}FILES+= func3.0
+${PACKAGE}FILES+= hash1.0
+${PACKAGE}FILES+= int-cmd1.0
+${PACKAGE}FILES+= killed1.0
+${PACKAGE}FILES+= killed2.0
+${PACKAGE}FILES+= not1.0
+${PACKAGE}FILES+= not2.0
+${PACKAGE}FILES+= path1.0
+${PACKAGE}FILES+= redir1.0
+${PACKAGE}FILES+= redir2.0
+${PACKAGE}FILES+= redir3.0
+${PACKAGE}FILES+= redir4.0
+${PACKAGE}FILES+= redir5.0
+${PACKAGE}FILES+= redir6.0
+${PACKAGE}FILES+= redir7.0
+${PACKAGE}FILES+= set-n1.0
+${PACKAGE}FILES+= set-n2.0
+${PACKAGE}FILES+= set-n3.0
+${PACKAGE}FILES+= set-n4.0
+${PACKAGE}FILES+= set-x1.0
+${PACKAGE}FILES+= set-x2.0
+${PACKAGE}FILES+= set-x3.0
+${PACKAGE}FILES+= set-x4.0
+${PACKAGE}FILES+= shellproc1.0
+${PACKAGE}FILES+= subshell1.0 subshell1.0.stdout
+${PACKAGE}FILES+= subshell2.0
+${PACKAGE}FILES+= subshell3.0
+${PACKAGE}FILES+= subshell4.0
+${PACKAGE}FILES+= unknown1.0
+${PACKAGE}FILES+= var-assign1.0
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/expansion/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/expansion/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/expansion/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,95 +1,95 @@
# $FreeBSD$
PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= arith1.0
-TESTS+= arith2.0
-TESTS+= arith3.0
-TESTS+= arith4.0
-TESTS+= arith5.0
-TESTS+= arith6.0
-TESTS+= arith7.0
-TESTS+= arith8.0
-TESTS+= arith9.0
-TESTS+= arith10.0
-TESTS+= arith11.0
-TESTS+= arith12.0
-TESTS+= arith13.0
-TESTS+= arith14.0
-TESTS+= assign1.0
-TESTS+= cmdsubst1.0
-TESTS+= cmdsubst2.0
-TESTS+= cmdsubst3.0
-TESTS+= cmdsubst4.0
-TESTS+= cmdsubst5.0
-TESTS+= cmdsubst6.0
-TESTS+= cmdsubst7.0
-TESTS+= cmdsubst8.0
-TESTS+= cmdsubst9.0
-TESTS+= cmdsubst10.0
-TESTS+= cmdsubst11.0
-TESTS+= cmdsubst12.0
-TESTS+= cmdsubst13.0
-TESTS+= cmdsubst14.0
-TESTS+= cmdsubst15.0
-TESTS+= cmdsubst16.0
-TESTS+= cmdsubst17.0
-TESTS+= export1.0
-TESTS+= export2.0
-TESTS+= export3.0
-TESTS+= heredoc1.0
-TESTS+= heredoc2.0
-TESTS+= ifs1.0
-TESTS+= ifs2.0
-TESTS+= ifs3.0
-TESTS+= ifs4.0
-TESTS+= ifs5.0
-TESTS+= ifs6.0
-TESTS+= ifs7.0
-TESTS+= length1.0
-TESTS+= length2.0
-TESTS+= length3.0
-TESTS+= length4.0
-TESTS+= length5.0
-TESTS+= length6.0
-TESTS+= length7.0
-TESTS+= length8.0
-TESTS+= local1.0
-TESTS+= local2.0
-TESTS+= pathname1.0
-TESTS+= pathname2.0
-TESTS+= pathname3.0
-TESTS+= pathname4.0
-TESTS+= pathname5.0
-TESTS+= plus-minus1.0
-TESTS+= plus-minus2.0
-TESTS+= plus-minus3.0
-TESTS+= plus-minus4.0
-TESTS+= plus-minus5.0
-TESTS+= plus-minus6.0
-TESTS+= plus-minus7.0
-TESTS+= plus-minus8.0
-TESTS+= question1.0
-TESTS+= readonly1.0
-TESTS+= redir1.0
-TESTS+= set-u1.0
-TESTS+= set-u2.0
-TESTS+= set-u3.0
-TESTS+= tilde1.0
-TESTS+= tilde2.0
-TESTS+= trim1.0
-TESTS+= trim2.0
-TESTS+= trim3.0
-TESTS+= trim4.0
-TESTS+= trim5.0
-TESTS+= trim6.0
-TESTS+= trim7.0
-TESTS+= trim8.0
-TESTS+= trim9.0
+${PACKAGE}FILES+= arith1.0
+${PACKAGE}FILES+= arith2.0
+${PACKAGE}FILES+= arith3.0
+${PACKAGE}FILES+= arith4.0
+${PACKAGE}FILES+= arith5.0
+${PACKAGE}FILES+= arith6.0
+${PACKAGE}FILES+= arith7.0
+${PACKAGE}FILES+= arith8.0
+${PACKAGE}FILES+= arith9.0
+${PACKAGE}FILES+= arith10.0
+${PACKAGE}FILES+= arith11.0
+${PACKAGE}FILES+= arith12.0
+${PACKAGE}FILES+= arith13.0
+${PACKAGE}FILES+= arith14.0
+${PACKAGE}FILES+= assign1.0
+${PACKAGE}FILES+= cmdsubst1.0
+${PACKAGE}FILES+= cmdsubst2.0
+${PACKAGE}FILES+= cmdsubst3.0
+${PACKAGE}FILES+= cmdsubst4.0
+${PACKAGE}FILES+= cmdsubst5.0
+${PACKAGE}FILES+= cmdsubst6.0
+${PACKAGE}FILES+= cmdsubst7.0
+${PACKAGE}FILES+= cmdsubst8.0
+${PACKAGE}FILES+= cmdsubst9.0
+${PACKAGE}FILES+= cmdsubst10.0
+${PACKAGE}FILES+= cmdsubst11.0
+${PACKAGE}FILES+= cmdsubst12.0
+${PACKAGE}FILES+= cmdsubst13.0
+${PACKAGE}FILES+= cmdsubst14.0
+${PACKAGE}FILES+= cmdsubst15.0
+${PACKAGE}FILES+= cmdsubst16.0
+${PACKAGE}FILES+= cmdsubst17.0
+${PACKAGE}FILES+= export1.0
+${PACKAGE}FILES+= export2.0
+${PACKAGE}FILES+= export3.0
+${PACKAGE}FILES+= heredoc1.0
+${PACKAGE}FILES+= heredoc2.0
+${PACKAGE}FILES+= ifs1.0
+${PACKAGE}FILES+= ifs2.0
+${PACKAGE}FILES+= ifs3.0
+${PACKAGE}FILES+= ifs4.0
+${PACKAGE}FILES+= ifs5.0
+${PACKAGE}FILES+= ifs6.0
+${PACKAGE}FILES+= ifs7.0
+${PACKAGE}FILES+= length1.0
+${PACKAGE}FILES+= length2.0
+${PACKAGE}FILES+= length3.0
+${PACKAGE}FILES+= length4.0
+${PACKAGE}FILES+= length5.0
+${PACKAGE}FILES+= length6.0
+${PACKAGE}FILES+= length7.0
+${PACKAGE}FILES+= length8.0
+${PACKAGE}FILES+= local1.0
+${PACKAGE}FILES+= local2.0
+${PACKAGE}FILES+= pathname1.0
+${PACKAGE}FILES+= pathname2.0
+${PACKAGE}FILES+= pathname3.0
+${PACKAGE}FILES+= pathname4.0
+${PACKAGE}FILES+= pathname5.0
+${PACKAGE}FILES+= plus-minus1.0
+${PACKAGE}FILES+= plus-minus2.0
+${PACKAGE}FILES+= plus-minus3.0
+${PACKAGE}FILES+= plus-minus4.0
+${PACKAGE}FILES+= plus-minus5.0
+${PACKAGE}FILES+= plus-minus6.0
+${PACKAGE}FILES+= plus-minus7.0
+${PACKAGE}FILES+= plus-minus8.0
+${PACKAGE}FILES+= question1.0
+${PACKAGE}FILES+= readonly1.0
+${PACKAGE}FILES+= redir1.0
+${PACKAGE}FILES+= set-u1.0
+${PACKAGE}FILES+= set-u2.0
+${PACKAGE}FILES+= set-u3.0
+${PACKAGE}FILES+= tilde1.0
+${PACKAGE}FILES+= tilde2.0
+${PACKAGE}FILES+= trim1.0
+${PACKAGE}FILES+= trim2.0
+${PACKAGE}FILES+= trim3.0
+${PACKAGE}FILES+= trim4.0
+${PACKAGE}FILES+= trim5.0
+${PACKAGE}FILES+= trim6.0
+${PACKAGE}FILES+= trim7.0
+${PACKAGE}FILES+= trim8.0
+${PACKAGE}FILES+= trim9.0
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/parameters/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/parameters/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/parameters/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,28 +1,28 @@
# $FreeBSD$
PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= env1.0
-TESTS+= exitstatus1.0
-TESTS+= mail1.0
-TESTS+= mail2.0
-TESTS+= optind1.0
-TESTS+= optind2.0
-TESTS+= positional1.0
-TESTS+= positional2.0
-TESTS+= positional3.0
-TESTS+= positional4.0
-TESTS+= positional5.0
-TESTS+= positional6.0
-TESTS+= positional7.0
-TESTS+= positional8.0
-TESTS+= positional9.0
-TESTS+= pwd1.0
-TESTS+= pwd2.0
+${PACKAGE}FILES+= env1.0
+${PACKAGE}FILES+= exitstatus1.0
+${PACKAGE}FILES+= mail1.0
+${PACKAGE}FILES+= mail2.0
+${PACKAGE}FILES+= optind1.0
+${PACKAGE}FILES+= optind2.0
+${PACKAGE}FILES+= positional1.0
+${PACKAGE}FILES+= positional2.0
+${PACKAGE}FILES+= positional3.0
+${PACKAGE}FILES+= positional4.0
+${PACKAGE}FILES+= positional5.0
+${PACKAGE}FILES+= positional6.0
+${PACKAGE}FILES+= positional7.0
+${PACKAGE}FILES+= positional8.0
+${PACKAGE}FILES+= positional9.0
+${PACKAGE}FILES+= pwd1.0
+${PACKAGE}FILES+= pwd2.0
.include <bsd.test.mk>
Modified: user/ngie/release-pkg-fix-tests/bin/sh/tests/parser/Makefile
==============================================================================
--- user/ngie/release-pkg-fix-tests/bin/sh/tests/parser/Makefile Tue May 3 22:20:55 2016 (r299011)
+++ user/ngie/release-pkg-fix-tests/bin/sh/tests/parser/Makefile Tue May 3 23:24:14 2016 (r299012)
@@ -1,85 +1,85 @@
# $FreeBSD$
PACKAGE= tests
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-TESTS= alias1.0
-TESTS+= alias2.0
-TESTS+= alias3.0
-TESTS+= alias4.0
-TESTS+= alias5.0
-TESTS+= alias6.0
-TESTS+= alias7.0
-TESTS+= alias8.0
-TESTS+= alias9.0
-TESTS+= alias10.0
-TESTS+= alias11.0
-TESTS+= alias12.0
-TESTS+= alias13.0
-TESTS+= alias14.0
-TESTS+= alias15.0 alias15.0.stdout
-TESTS+= and-pipe-not.0
-TESTS+= case1.0
-TESTS+= case2.0
-TESTS+= comment1.0
-TESTS+= comment2.42
-TESTS+= dollar-quote1.0
-TESTS+= dollar-quote2.0
-TESTS+= dollar-quote3.0
-TESTS+= dollar-quote4.0
-TESTS+= dollar-quote5.0
-TESTS+= dollar-quote6.0
-TESTS+= dollar-quote7.0
-TESTS+= dollar-quote8.0
-TESTS+= dollar-quote9.0
-TESTS+= dollar-quote10.0
-TESTS+= dollar-quote11.0
-TESTS+= dollar-quote12.0
-TESTS+= dollar-quote13.0
-TESTS+= empty-braces1.0
-TESTS+= empty-cmd1.0
-TESTS+= for1.0
-TESTS+= for2.0
-TESTS+= func1.0
-TESTS+= func2.0
-TESTS+= func3.0
-TESTS+= heredoc1.0
-TESTS+= heredoc2.0
-TESTS+= heredoc3.0
-TESTS+= heredoc4.0
-TESTS+= heredoc5.0
-TESTS+= heredoc6.0
-TESTS+= heredoc7.0
-TESTS+= heredoc8.0
-TESTS+= heredoc9.0
-TESTS+= heredoc10.0
-TESTS+= heredoc11.0
-TESTS+= heredoc12.0
-TESTS+= heredoc13.0
-TESTS+= line-cont1.0
-TESTS+= line-cont2.0
-TESTS+= line-cont3.0
-TESTS+= line-cont4.0
-TESTS+= line-cont5.0
-TESTS+= line-cont6.0
-TESTS+= line-cont7.0
-TESTS+= line-cont8.0
-TESTS+= line-cont9.0
-TESTS+= line-cont10.0
-TESTS+= line-cont11.0
-TESTS+= no-space1.0
-TESTS+= no-space2.0
-TESTS+= nul1.0
-TESTS+= only-redir1.0
-TESTS+= only-redir2.0
-TESTS+= only-redir3.0
-TESTS+= only-redir4.0
-TESTS+= pipe-not1.0
-TESTS+= set-v1.0 set-v1.0.stderr
-TESTS+= var-assign1.0
+${PACKAGE}FILES+= alias1.0
+${PACKAGE}FILES+= alias2.0
+${PACKAGE}FILES+= alias3.0
+${PACKAGE}FILES+= alias4.0
+${PACKAGE}FILES+= alias5.0
+${PACKAGE}FILES+= alias6.0
+${PACKAGE}FILES+= alias7.0
+${PACKAGE}FILES+= alias8.0
+${PACKAGE}FILES+= alias9.0
+${PACKAGE}FILES+= alias10.0
+${PACKAGE}FILES+= alias11.0
+${PACKAGE}FILES+= alias12.0
+${PACKAGE}FILES+= alias13.0
+${PACKAGE}FILES+= alias14.0
+${PACKAGE}FILES+= alias15.0 alias15.0.stdout
+${PACKAGE}FILES+= and-pipe-not.0
+${PACKAGE}FILES+= case1.0
+${PACKAGE}FILES+= case2.0
+${PACKAGE}FILES+= comment1.0
+${PACKAGE}FILES+= comment2.42
+${PACKAGE}FILES+= dollar-quote1.0
+${PACKAGE}FILES+= dollar-quote2.0
+${PACKAGE}FILES+= dollar-quote3.0
+${PACKAGE}FILES+= dollar-quote4.0
+${PACKAGE}FILES+= dollar-quote5.0
+${PACKAGE}FILES+= dollar-quote6.0
+${PACKAGE}FILES+= dollar-quote7.0
+${PACKAGE}FILES+= dollar-quote8.0
+${PACKAGE}FILES+= dollar-quote9.0
+${PACKAGE}FILES+= dollar-quote10.0
+${PACKAGE}FILES+= dollar-quote11.0
+${PACKAGE}FILES+= dollar-quote12.0
+${PACKAGE}FILES+= dollar-quote13.0
+${PACKAGE}FILES+= empty-braces1.0
+${PACKAGE}FILES+= empty-cmd1.0
+${PACKAGE}FILES+= for1.0
+${PACKAGE}FILES+= for2.0
+${PACKAGE}FILES+= func1.0
+${PACKAGE}FILES+= func2.0
+${PACKAGE}FILES+= func3.0
+${PACKAGE}FILES+= heredoc1.0
+${PACKAGE}FILES+= heredoc2.0
+${PACKAGE}FILES+= heredoc3.0
+${PACKAGE}FILES+= heredoc4.0
+${PACKAGE}FILES+= heredoc5.0
+${PACKAGE}FILES+= heredoc6.0
+${PACKAGE}FILES+= heredoc7.0
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list