Index: head/bin/cat/tests/Makefile =================================================================== --- head/bin/cat/tests/Makefile (revision 299093) +++ head/bin/cat/tests/Makefile (revision 299094) @@ -1,16 +1,12 @@ # $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 .include Index: head/bin/date/tests/Makefile =================================================================== --- head/bin/date/tests/Makefile (revision 299093) +++ head/bin/date/tests/Makefile (revision 299094) @@ -1,11 +1,5 @@ # $FreeBSD$ -.include - -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH= format_string_test .include Index: head/bin/dd/tests/Makefile =================================================================== --- head/bin/dd/tests/Makefile (revision 299093) +++ head/bin/dd/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= dd_test .include .include Index: head/bin/expr/tests/Makefile =================================================================== --- head/bin/expr/tests/Makefile (revision 299093) +++ head/bin/expr/tests/Makefile (revision 299094) @@ -1,14 +1,10 @@ # $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' ATF_TESTS_SH_SED_expr_test+= -e 's/"expr: integer overflow or underflow occurred for operation.*"/"expr: overflow"/g' .include .include Index: head/bin/ls/tests/Makefile =================================================================== --- head/bin/ls/tests/Makefile (revision 299093) +++ head/bin/ls/tests/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $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 TEST_METADATA.ls_tests+= required_user="unprivileged" TEST_METADATA.ls_tests+= required_files="/usr/bin/awk /usr/bin/nc /usr/bin/sort" .include Index: head/bin/mv/tests/Makefile =================================================================== --- head/bin/mv/tests/Makefile (revision 299093) +++ head/bin/mv/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= legacy_test .include Index: head/bin/pax/tests/Makefile =================================================================== --- head/bin/pax/tests/Makefile (revision 299093) +++ head/bin/pax/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_PERL= legacy_test .include Index: head/bin/pkill/tests/Makefile =================================================================== --- head/bin/pkill/tests/Makefile (revision 299093) +++ head/bin/pkill/tests/Makefile (revision 299094) @@ -1,42 +1,38 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= pgrep-F_test TAP_TESTS_SH+= pgrep-LF_test TAP_TESTS_SH+= pgrep-P_test TAP_TESTS_SH+= pgrep-U_test TAP_TESTS_SH+= pgrep-_g_test TAP_TESTS_SH+= pgrep-_s_test TAP_TESTS_SH+= pgrep-g_test TAP_TESTS_SH+= pgrep-i_test TAP_TESTS_SH+= pgrep-j_test TEST_METADATA.pgrep-j_test+= required_user="root" TEST_METADATA.pgrep-j_test+= required_programs="jail jls" TAP_TESTS_SH+= pgrep-l_test TAP_TESTS_SH+= pgrep-n_test TAP_TESTS_SH+= pgrep-o_test TAP_TESTS_SH+= pgrep-q_test TAP_TESTS_SH+= pgrep-s_test TAP_TESTS_SH+= pgrep-t_test TAP_TESTS_SH+= pgrep-v_test TAP_TESTS_SH+= pgrep-x_test TAP_TESTS_SH+= pkill-F_test TAP_TESTS_SH+= pkill-LF_test TAP_TESTS_SH+= pkill-P_test TAP_TESTS_SH+= pkill-U_test TAP_TESTS_SH+= pkill-_g_test TAP_TESTS_SH+= pkill-g_test TAP_TESTS_SH+= pkill-i_test TAP_TESTS_SH+= pkill-j_test TEST_METADATA.pkill-j_test+= required_user="root" TEST_METADATA.pkill-j_test+= required_programs="jail jls" TAP_TESTS_SH+= pkill-s_test TAP_TESTS_SH+= pkill-t_test TAP_TESTS_SH+= pkill-x_test .include Index: head/bin/sh/tests/Makefile =================================================================== --- head/bin/sh/tests/Makefile (revision 299093) +++ head/bin/sh/tests/Makefile (revision 299094) @@ -1,17 +1,13 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= expansion TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e .include Index: head/bin/sh/tests/builtins/Makefile =================================================================== --- head/bin/sh/tests/builtins/Makefile (revision 299093) +++ head/bin/sh/tests/builtins/Makefile (revision 299094) @@ -1,181 +1,178 @@ # $FreeBSD$ +PACKAGE= tests + .include -PACKAGE= tests -FILESGROUPS= TESTS -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 +${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" -FILES+= locale1.0 +${PACKAGE}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+= set3.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+= trap17.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 +${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 Index: head/bin/sh/tests/errors/Makefile =================================================================== --- head/bin/sh/tests/errors/Makefile (revision 299093) +++ head/bin/sh/tests/errors/Makefile (revision 299094) @@ -1,37 +1,34 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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 +${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 Index: head/bin/sh/tests/execution/Makefile =================================================================== --- head/bin/sh/tests/execution/Makefile (revision 299093) +++ head/bin/sh/tests/execution/Makefile (revision 299094) @@ -1,59 +1,56 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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 +${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 Index: head/bin/sh/tests/expansion/Makefile =================================================================== --- head/bin/sh/tests/expansion/Makefile (revision 299093) +++ head/bin/sh/tests/expansion/Makefile (revision 299094) @@ -1,98 +1,95 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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 +${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 Index: head/bin/sh/tests/parameters/Makefile =================================================================== --- head/bin/sh/tests/parameters/Makefile (revision 299093) +++ head/bin/sh/tests/parameters/Makefile (revision 299094) @@ -1,31 +1,28 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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 +${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 Index: head/bin/sh/tests/parser/Makefile =================================================================== --- head/bin/sh/tests/parser/Makefile (revision 299093) +++ head/bin/sh/tests/parser/Makefile (revision 299094) @@ -1,88 +1,85 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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+= comment1.0 -FILES+= comment2.42 -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+= nul1.0 -FILES+= only-redir1.0 -FILES+= only-redir2.0 -FILES+= only-redir3.0 -FILES+= only-redir4.0 -FILES+= pipe-not1.0 -FILES+= set-v1.0 set-v1.0.stderr -FILES+= 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 +${PACKAGE}FILES+= heredoc8.0 +${PACKAGE}FILES+= heredoc9.0 +${PACKAGE}FILES+= heredoc10.0 +${PACKAGE}FILES+= heredoc11.0 +${PACKAGE}FILES+= heredoc12.0 +${PACKAGE}FILES+= heredoc13.0 +${PACKAGE}FILES+= line-cont1.0 +${PACKAGE}FILES+= line-cont2.0 +${PACKAGE}FILES+= line-cont3.0 +${PACKAGE}FILES+= line-cont4.0 +${PACKAGE}FILES+= line-cont5.0 +${PACKAGE}FILES+= line-cont6.0 +${PACKAGE}FILES+= line-cont7.0 +${PACKAGE}FILES+= line-cont8.0 +${PACKAGE}FILES+= line-cont9.0 +${PACKAGE}FILES+= line-cont10.0 +${PACKAGE}FILES+= line-cont11.0 +${PACKAGE}FILES+= no-space1.0 +${PACKAGE}FILES+= no-space2.0 +${PACKAGE}FILES+= nul1.0 +${PACKAGE}FILES+= only-redir1.0 +${PACKAGE}FILES+= only-redir2.0 +${PACKAGE}FILES+= only-redir3.0 +${PACKAGE}FILES+= only-redir4.0 +${PACKAGE}FILES+= pipe-not1.0 +${PACKAGE}FILES+= set-v1.0 set-v1.0.stderr +${PACKAGE}FILES+= var-assign1.0 .include Index: head/bin/sh/tests/set-e/Makefile =================================================================== --- head/bin/sh/tests/set-e/Makefile (revision 299093) +++ head/bin/sh/tests/set-e/Makefile (revision 299094) @@ -1,49 +1,46 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -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 +${PACKAGE}FILES+= and1.0 +${PACKAGE}FILES+= and2.1 +${PACKAGE}FILES+= and3.0 +${PACKAGE}FILES+= and4.0 +${PACKAGE}FILES+= background1.0 +${PACKAGE}FILES+= cmd1.0 +${PACKAGE}FILES+= cmd2.1 +${PACKAGE}FILES+= elif1.0 +${PACKAGE}FILES+= elif2.0 +${PACKAGE}FILES+= eval1.0 +${PACKAGE}FILES+= eval2.1 +${PACKAGE}FILES+= for1.0 +${PACKAGE}FILES+= func1.0 +${PACKAGE}FILES+= func2.1 +${PACKAGE}FILES+= if1.0 +${PACKAGE}FILES+= if2.0 +${PACKAGE}FILES+= if3.0 +${PACKAGE}FILES+= not1.0 +${PACKAGE}FILES+= not2.0 +${PACKAGE}FILES+= or1.0 +${PACKAGE}FILES+= or2.0 +${PACKAGE}FILES+= or3.1 +${PACKAGE}FILES+= pipe1.1 +${PACKAGE}FILES+= pipe2.0 +${PACKAGE}FILES+= return1.0 +${PACKAGE}FILES+= semi1.1 +${PACKAGE}FILES+= semi2.1 +${PACKAGE}FILES+= subshell1.0 +${PACKAGE}FILES+= subshell2.1 +${PACKAGE}FILES+= until1.0 +${PACKAGE}FILES+= until2.0 +${PACKAGE}FILES+= until3.0 +${PACKAGE}FILES+= while1.0 +${PACKAGE}FILES+= while2.0 +${PACKAGE}FILES+= while3.0 .include Index: head/bin/sleep/tests/Makefile =================================================================== --- head/bin/sleep/tests/Makefile (revision 299093) +++ head/bin/sleep/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= sleep_test .include Index: head/bin/test/tests/Makefile =================================================================== --- head/bin/test/tests/Makefile (revision 299093) +++ head/bin/test/tests/Makefile (revision 299094) @@ -1,17 +1,13 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= legacy_test # Some tests in here are silently not run when the tests are executed as # root. Explicitly tell Kyua to drop privileges. # # TODO(jmmv): Kyua needs to do this by default, not only when explicitly # requested. See https://code.google.com/p/kyua/issues/detail?id=6 TEST_METADATA.legacy_test+= required_user="unprivileged" .include Index: head/bin/tests/Makefile =================================================================== --- head/bin/tests/Makefile (revision 299093) +++ head/bin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/lib/tests/Makefile =================================================================== --- head/cddl/lib/tests/Makefile (revision 299093) +++ head/cddl/lib/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/sbin/tests/Makefile =================================================================== --- head/cddl/sbin/tests/Makefile (revision 299093) +++ head/cddl/sbin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/tests/Makefile =================================================================== --- head/cddl/tests/Makefile (revision 299093) +++ head/cddl/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.bin/tests/Makefile =================================================================== --- head/cddl/usr.bin/tests/Makefile (revision 299093) +++ head/cddl/usr.bin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.sbin/dtrace/tests/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/Makefile (revision 299094) @@ -1,14 +1,14 @@ # $FreeBSD$ .include TESTS_SUBDIRS+= common .PATH: ${SRCTOP}/tests -KYUAFILE= YES +KYUAFILE= yes .PATH: ${.CURDIR}/tools SCRIPTSDIR= ${TESTSDIR} SCRIPTS= dtest.sh .include Index: head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile (revision 299094) @@ -1,189 +1,191 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_AGG_FUNC.bad.d \ err.D_AGG_MDIM.bad.d \ err.D_AGG_NULL.bad.d \ err.D_AGG_REDEF.redef.d \ err.D_AGG_SCALAR.avgtoofew.d \ err.D_AGG_SCALAR.maxnoarg.d \ err.D_AGG_SCALAR.mintoofew.d \ err.D_AGG_SCALAR.quantizetoofew.d \ err.D_AGG_SCALAR.stddevtoofew.d \ err.D_AGG_SCALAR.sumtoofew.d \ err.D_CLEAR_AGGARG.bad.d \ err.D_CLEAR_PROTO.bad.d \ err.D_FUNC_IDENT.bad.d \ err.D_FUNC_UNDEF.badaggfunc.d \ err.D_IDENT_UNDEF.badexpr.d \ err.D_IDENT_UNDEF.badkey3.d \ err.D_IDENT_UNDEF.noeffect.d \ err.D_KEY_TYPE.badkey1.d \ err.D_KEY_TYPE.badkey2.d \ err.D_KEY_TYPE.badkey4.d \ err.D_LQUANT_BASETYPE.lqbad1.d \ err.D_LQUANT_BASETYPE.lqshort.d \ err.D_LQUANT_BASEVAL.bad.d \ err.D_LQUANT_LIMTYPE.lqbad1.d \ err.D_LQUANT_LIMVAL.bad.d \ err.D_LQUANT_MATCHBASE.d \ err.D_LQUANT_MATCHBASE.order.d \ err.D_LQUANT_MATCHLIM.d \ err.D_LQUANT_MATCHLIM.order.d \ err.D_LQUANT_MATCHSTEP.d \ err.D_LQUANT_MISMATCH.lqbadarg.d \ err.D_LQUANT_STEPLARGE.lqtoofew.d \ err.D_LQUANT_STEPSMALL.bad.d \ err.D_LQUANT_STEPTYPE.lqbadinc.d \ err.D_LQUANT_STEPVAL.bad.d \ err.D_NORMALIZE_AGGARG.bad.d \ err.D_NORMALIZE_PROTO.bad.d \ err.D_NORMALIZE_SCALAR.bad.d \ err.D_PROTO_ARG.lquantizetoofew.d \ err.D_PROTO_LEN.avgnoarg.d \ err.D_PROTO_LEN.avgtoomany.d \ err.D_PROTO_LEN.counttoomany.d \ err.D_PROTO_LEN.lquantizenoarg.d \ err.D_PROTO_LEN.lquantizetoomany.d \ err.D_PROTO_LEN.maxnoarg.d \ err.D_PROTO_LEN.maxtoomany.d \ err.D_PROTO_LEN.minnoarg.d \ err.D_PROTO_LEN.mintoomany.d \ err.D_PROTO_LEN.quantizenoarg.d \ err.D_PROTO_LEN.quantizetoomany.d \ err.D_PROTO_LEN.stddevnoarg.d \ err.D_PROTO_LEN.stddevtoomany.d \ err.D_PROTO_LEN.sumnoarg.d \ err.D_PROTO_LEN.sumtoomany.d \ err.D_TRUNC_AGGARG.bad.d \ err.D_TRUNC_PROTO.badmany.d \ err.D_TRUNC_PROTO.badnone.d \ err.D_TRUNC_SCALAR.bad.d \ tst.aggencoding.d \ tst.aggencoding.d.out \ tst.agghist.d \ tst.agghist.d.out \ tst.aggpack.d \ tst.aggpack.d.out \ tst.aggpackbanner.ksh \ tst.aggpackbanner.ksh.out \ tst.aggpackzoom.d \ tst.aggpackzoom.d.out \ tst.aggzoom.d \ tst.aggzoom.d.out \ tst.allquant.d \ tst.allquant.d.out \ tst.avg.d \ tst.avg.d.out \ tst.avg_neg.d \ tst.avg_neg.d.out \ tst.clear.d \ tst.clear.d.out \ tst.clearavg.d \ tst.clearavg.d.out \ tst.clearavg2.d \ tst.clearavg2.d.out \ tst.cleardenormalize.d \ tst.cleardenormalize.d.out \ tst.clearlquantize.d \ tst.clearlquantize.d.out \ tst.clearnormalize.d \ tst.clearnormalize.d.out \ tst.clearstddev.d \ tst.clearstddev.d.out \ tst.count.d \ tst.count.d.out \ tst.count2.d \ tst.count2.d.out \ tst.count3.d \ tst.denormalize.d \ tst.denormalize.d.out \ tst.denormalizeonly.d \ tst.denormalizeonly.d.out \ tst.fmtnormalize.d \ tst.fmtnormalize.d.out \ tst.forms.d \ tst.forms.d.out \ tst.goodkey.d \ tst.keysort.d \ tst.keysort.d.out \ tst.lquantize.d \ tst.lquantize.d.out \ tst.lquantnormal.d \ tst.lquantnormal.d.out \ tst.lquantrange.d \ tst.lquantrange.d.out \ tst.lquantround.d \ tst.lquantround.d.out \ tst.lquantzero.d \ tst.lquantzero.d.out \ tst.max.d \ tst.max.d.out \ tst.max_neg.d \ tst.max_neg.d.out \ tst.min.d \ tst.min.d.out \ tst.min_neg.d \ tst.min_neg.d.out \ tst.multiaggs1.d \ tst.multiaggs2.d \ tst.multiaggs2.d.out \ tst.multiaggs3.d \ tst.multiaggs3.d.out \ tst.multinormalize.d \ tst.multinormalize.d.out \ tst.neglquant.d \ tst.neglquant.d.out \ tst.negorder.d \ tst.negorder.d.out \ tst.negquant.d \ tst.negquant.d.out \ tst.negtrunc.d \ tst.negtrunc.d.out \ tst.negtruncquant.d \ tst.negtruncquant.d.out \ tst.normalize.d \ tst.normalize.d.out \ tst.order.d \ tst.order.d.out \ tst.quantize.d \ tst.quantize.d.out \ tst.quantmany.d \ tst.quantmany.d.out \ tst.quantround.d \ tst.quantround.d.out \ tst.quantzero.d \ tst.quantzero.d.out \ tst.signature.d \ tst.signedkeys.d \ tst.signedkeys.d.out \ tst.signedkeyspos.d \ tst.signedkeyspos.d.out \ tst.sizedkeys.d \ tst.sizedkeys.d.out \ tst.stddev.d \ tst.stddev.d.out \ tst.subr.d \ tst.sum.d \ tst.sum.d.out \ tst.trunc.d \ tst.trunc.d.out \ tst.trunc0.d \ tst.trunc0.d.out \ tst.truncquant.d \ tst.truncquant.d.out \ tst.valsortkeypos.d \ tst.valsortkeypos.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile (revision 299094) @@ -1,32 +1,34 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DIV_ZERO.divby0.d \ err.D_DIV_ZERO.divby0_1.d \ err.D_DIV_ZERO.divby0_2.d \ err.D_DIV_ZERO.modby0.d \ err.D_SYNTAX.addmin.d \ err.D_SYNTAX.divmin.d \ err.D_SYNTAX.muladd.d \ err.D_SYNTAX.muldiv.d \ tst.basics.d \ tst.basics.d.out \ tst.compcast.d \ tst.compcast.d.out \ tst.compnarrowassign.d \ tst.compnarrowassign.d.out \ tst.execcast.d \ tst.execcast.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile (revision 299094) @@ -1,29 +1,31 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ARR_BADREF.bad.d \ err.D_DECL_ARRBIG.toobig.d \ err.D_DECL_ARRNULL.bad.d \ err.D_DECL_ARRSUB.bad.d \ err.D_DECL_PROTO_TYPE.badtuple.d \ err.D_IDENT_UNDEF.badureg.d \ tst.basic1.d \ tst.basic2.d \ tst.basic3.d \ tst.basic4.d \ tst.basic5.d \ tst.basic6.d \ tst.uregsarray.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile (revision 299094) @@ -1,32 +1,34 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_OP_INCOMPAT.dupgtype.d \ err.D_OP_INCOMPAT.dupttype.d \ err.D_OP_INCOMPAT.this.d \ err.D_PROTO_ARG.badsig.d \ err.D_PROTO_LEN.toofew.d \ err.D_PROTO_LEN.toomany.d \ err.D_SYNTAX.errassign.d \ err.tupoflow.d \ tst.cpyarray.d \ tst.diffprofile.d \ tst.initialize.d \ tst.invalidref.d \ tst.misc.d \ tst.orthogonality.d \ tst.this.d \ tst.valassign.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile (revision 299094) @@ -1,22 +1,24 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.begin.d \ err.D_PDESC_ZERO.tick.d \ tst.begin.d \ tst.begin.d.out \ tst.multibegin.d \ tst.multibegin.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile (revision 299094) @@ -1,26 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ADDROF_BITFIELD.BitfieldAddress.d \ err.D_DECL_BFCONST.NegBitField.d \ err.D_DECL_BFCONST.ZeroBitField.d \ err.D_DECL_BFSIZE.ExceedBaseType.d \ err.D_DECL_BFSIZE.GreaterThan64.d \ err.D_DECL_BFTYPE.badtype.d \ err.D_OFFSETOF_BITFIELD.d \ err.D_SIZEOF_BITFIELD.SizeofBitfield.d \ tst.BitFieldPromotion.d \ tst.SizeofBitField.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile (revision 299094) @@ -1,37 +1,39 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.end.d \ err.resize1.d \ err.resize2.d \ err.resize3.d \ err.zerobuf.d \ tst.alignring.d \ tst.cputime.ksh \ tst.dynvarsize.d \ tst.fill1.d \ tst.fill1.d.out \ tst.resize1.d \ tst.resize2.d \ tst.resize3.d \ tst.ring1.d \ tst.ring2.d \ tst.ring2.d.out \ tst.ring3.d \ tst.ring3.d.out \ tst.smallring.d \ tst.switch1.d \ tst.switch1.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile (revision 299094) @@ -1,48 +1,50 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_XLATE_NOCONV.cpuusage.d \ err.D_XLATE_NOCONV.nice.d \ err.D_XLATE_NOCONV.priority.d \ err.D_XLATE_NOCONV.prsize.d \ err.D_XLATE_NOCONV.rssize.d \ tst.arg0.d \ tst.arg0clause.d \ tst.arg1.d \ tst.arg1to8.d \ tst.arg1to8clause.d \ tst.caller.d \ tst.caller1.d \ tst.epid.d \ tst.epid1.d \ tst.errno.d \ tst.errno1.d \ tst.execname.d \ tst.hpriority.d \ tst.id.d \ tst.id1.d \ tst.ipl.d \ tst.ipl1.d \ tst.lwpsinfo.d \ tst.lwpsinfo1.d \ tst.pid.d \ tst.pid1.d \ tst.psinfo.d \ tst.psinfo1.d \ tst.tid.d \ tst.tid1.d \ tst.timestamp.d \ tst.vtimestamp.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile (revision 299094) @@ -1,18 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_NOREG.noreg.d \ err.baddif.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile (revision 299094) @@ -1,26 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_IDENT_UNDEF.aggfun.d \ err.D_IDENT_UNDEF.aggtup.d \ err.D_IDENT_UNDEF.arrtup.d \ err.D_IDENT_UNDEF.body.d \ err.D_IDENT_UNDEF.both.d \ err.D_IDENT_UNDEF.pred.d \ tst.nopred.d \ tst.pred.d \ tst.predfirst.d \ tst.predlast.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile (revision 299094) @@ -1,27 +1,29 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.lowfrequency.d \ err.D_PDESC_ZERO.malformedoverflow.d \ err.D_PDESC_ZERO.nonexistentevent.d \ err.cpcvscpustatpart1.ksh \ err.cpcvscpustatpart2.ksh \ err.cputrackfailtostart.ksh \ err.cputrackterminates.ksh \ err.toomanyenablings.d \ tst.allcpus.ksh \ tst.genericevent.d \ tst.platformevent.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile (revision 299094) @@ -1,30 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DECL_LOCASSC.NonLocalAssoc.d \ err.D_DECL_LONGINT.LongStruct.d \ err.D_DECL_PARMCLASS.BadStorageClass.d \ err.D_DECL_PROTO_NAME.VoidName.d \ err.D_DECL_PROTO_TYPE.Dyn.d \ err.D_DECL_PROTO_VARARGS.VarLenArgs.d \ err.D_DECL_PROTO_VOID.NonSoleVoid.d \ err.D_DECL_SIGNINT.UnsignedStruct.d \ err.D_DECL_VOIDATTR.ShortVoidDecl.d \ tst.arrays.d \ tst.basics.d \ tst.funcs.d \ tst.pointers.d \ tst.varargsfuncs.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile (revision 299094) @@ -1,32 +1,34 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ badptr.d \ countdown.d \ counter.d \ errorpath.d \ hello.d \ kstat.d \ ksyms.d \ renormalize.d \ rtime.d \ rw.d \ rwinfo.d \ rwtime.d \ specopen.d \ truss.d \ trussrw.d \ userfunc.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile (revision 299094) @@ -1,24 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ drp.DTRACEDROP_AGGREGATION.d \ drp.DTRACEDROP_DBLERROR.d \ drp.DTRACEDROP_DYNAMIC.d \ drp.DTRACEDROP_PRINCIPAL.d \ drp.DTRACEDROP_PRINCIPAL.end.d \ drp.DTRACEDROP_SPEC.d \ drp.DTRACEDROP_SPECUNAVAIL.d \ drp.DTRACEDROP_STKSTROVERFLOW.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile (revision 299094) @@ -1,118 +1,120 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.InvalidDescription1.d \ man.APIVersion.d \ man.AddSearchPath.d \ man.CoalesceTrace.d \ man.ELFGeneration.d \ man.IncludedFilePath.d \ man.ShowCompilerCode.d \ man.VerboseStabilityReport.d \ tst.AddSearchPath.d.ksh \ tst.BufsizeGiga.d.ksh \ tst.BufsizeKilo.d.ksh \ tst.BufsizeMega.d.ksh \ tst.BufsizeTera.d.ksh \ tst.DataModel32.d.ksh \ tst.DataModel64.d.ksh \ tst.DefineNameWithCPP.d.ksh \ tst.DefineNameWithCPP.d.ksh.out \ tst.DestructWithFunction.d.ksh \ tst.DestructWithFunction.d.ksh.out \ tst.DestructWithID.d.ksh \ tst.DestructWithID.d.ksh.out \ tst.DestructWithModule.d.ksh \ tst.DestructWithModule.d.ksh.out \ tst.DestructWithName.d.ksh \ tst.DestructWithName.d.ksh.out \ tst.DestructWithProvider.d.ksh \ tst.DestructWithProvider.d.ksh.out \ tst.DestructWithoutW.d.ksh \ tst.ELFGenerationOut.d.ksh \ tst.ELFGenerationWithO.d.ksh \ tst.ExitStatus1.d.ksh \ tst.ExitStatus2.d.ksh \ tst.ExtraneousProbeIds.d.ksh \ tst.InvalidFuncName1.d.ksh \ tst.InvalidFuncName2.d.ksh \ tst.InvalidId1.d.ksh \ tst.InvalidId2.d.ksh \ tst.InvalidId3.d.ksh \ tst.InvalidModule1.d.ksh \ tst.InvalidModule2.d.ksh \ tst.InvalidModule3.d.ksh \ tst.InvalidModule4.d.ksh \ tst.InvalidProbeIdentifier.d.ksh \ tst.InvalidProvider1.d.ksh \ tst.InvalidProvider2.d.ksh \ tst.InvalidProvider3.d.ksh \ tst.InvalidProvider4.d.ksh \ tst.InvalidTraceFunc1.d.ksh \ tst.InvalidTraceFunc2.d.ksh \ tst.InvalidTraceFunc3.d.ksh \ tst.InvalidTraceFunc4.d.ksh \ tst.InvalidTraceFunc5.d.ksh \ tst.InvalidTraceFunc6.d.ksh \ tst.InvalidTraceFunc7.d.ksh \ tst.InvalidTraceFunc8.d.ksh \ tst.InvalidTraceFunc9.d.ksh \ tst.InvalidTraceID1.d.ksh \ tst.InvalidTraceID2.d.ksh \ tst.InvalidTraceID3.d.ksh \ tst.InvalidTraceID4.d.ksh \ tst.InvalidTraceID5.d.ksh \ tst.InvalidTraceID6.d.ksh \ tst.InvalidTraceID7.d.ksh \ tst.InvalidTraceModule1.d.ksh \ tst.InvalidTraceModule2.d.ksh \ tst.InvalidTraceModule3.d.ksh \ tst.InvalidTraceModule4.d.ksh \ tst.InvalidTraceModule5.d.ksh \ tst.InvalidTraceModule6.d.ksh \ tst.InvalidTraceModule7.d.ksh \ tst.InvalidTraceModule8.d.ksh \ tst.InvalidTraceName1.d.ksh \ tst.InvalidTraceName2.d.ksh \ tst.InvalidTraceName3.d.ksh \ tst.InvalidTraceName4.d.ksh \ tst.InvalidTraceName5.d.ksh \ tst.InvalidTraceName6.d.ksh \ tst.InvalidTraceName7.d.ksh \ tst.InvalidTraceName8.d.ksh \ tst.InvalidTraceName9.d.ksh \ tst.InvalidTraceProvider1.d.ksh \ tst.InvalidTraceProvider2.d.ksh \ tst.InvalidTraceProvider3.d.ksh \ tst.InvalidTraceProvider4.d.ksh \ tst.InvalidTraceProvider5.d.ksh \ tst.MultipleInvalidProbeId.d.ksh \ tst.PreprocessorStatement.d.ksh \ tst.QuietMode.d.ksh \ tst.QuietMode.d.ksh.out \ tst.TestCompile.d.ksh \ tst.TestCompile.d.ksh.out \ tst.UnDefineNameWithCPP.d.ksh \ tst.ZeroFunctionProbes.d.ksh \ tst.ZeroFunctionProbes.d.ksh.out \ tst.ZeroModuleProbes.d.ksh \ tst.ZeroModuleProbes.d.ksh.out \ tst.ZeroNameProbes.d.ksh \ tst.ZeroNameProbes.d.ksh.out \ tst.ZeroProbeIdentfier.d.ksh \ tst.ZeroProbesWithoutZ.d.ksh \ tst.ZeroProviderProbes.d.ksh \ tst.ZeroProviderProbes.d.ksh.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/end/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/end/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/end/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_IDENT_UNDEF.timespent.d \ tst.end.d \ tst.endwithoutbegin.d \ tst.multibeginend.d \ tst.multiend.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DECL_IDRED.EnumSameName.d \ err.D_UNKNOWN.RepeatIdentifiers.d \ tst.EnumEquality.d \ tst.EnumSameValue.d \ tst.EnumValAssign.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/error/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/error/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/error/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.DTRACEFLT_BADADDR.d \ tst.DTRACEFLT_DIVZERO.d \ tst.DTRACEFLT_UNKNOWN.d \ tst.error.d \ tst.errorend.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PROTO_LEN.noarg.d \ err.exitarg1.d \ tst.basic1.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile (revision 299094) @@ -1,26 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.notreturn.d \ tst.basic.d \ tst.functionentry.d \ tst.functionreturnvalue.d \ tst.ioctlargs.d \ tst.offset.d \ tst.offsetzero.d \ tst.return.d \ tst.return0.d \ tst.tailcall.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile (revision 299094) @@ -1,113 +1,115 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_FUNC_UNDEF.progenyofbad1.d \ err.D_OP_VFPTR.badop.d \ err.D_PROTO_ARG.chillbadarg.d \ err.D_PROTO_ARG.copyoutbadarg.d \ err.D_PROTO_ARG.mobadarg.d \ err.D_PROTO_ARG.raisebadarg.d \ err.D_PROTO_ARG.tolower.d \ err.D_PROTO_ARG.toupper.d \ err.D_PROTO_LEN.allocanoarg.d \ err.D_PROTO_LEN.badbreakpoint.d \ err.D_PROTO_LEN.chilltoofew.d \ err.D_PROTO_LEN.chilltoomany.d \ err.D_PROTO_LEN.copyoutstrbadarg.d \ err.D_PROTO_LEN.copyoutstrtoofew.d \ err.D_PROTO_LEN.copyouttoofew.d \ err.D_PROTO_LEN.copyouttoomany.d \ err.D_PROTO_LEN.motoofew.d \ err.D_PROTO_LEN.motoomany.d \ err.D_PROTO_LEN.mtabadarg.d \ err.D_PROTO_LEN.mtatoofew.d \ err.D_PROTO_LEN.mtatoomany.d \ err.D_PROTO_LEN.panicbadarg.d \ err.D_PROTO_LEN.progenyofbad2.d \ err.D_PROTO_LEN.stopbadarg.d \ err.D_PROTO_LEN.tolower.d \ err.D_PROTO_LEN.tolowertoomany.d \ err.D_PROTO_LEN.toupper.d \ err.D_PROTO_LEN.touppertoomany.d \ err.D_STRINGOF_TYPE.badstringof.d \ err.D_VAR_UNDEF.badvar.d \ err.badalloca.d \ err.badalloca2.d \ err.badbcopy.d \ err.badbcopy1.d \ err.badbcopy2.d \ err.badbcopy3.d \ err.badbcopy4.d \ err.badbcopy5.d \ err.badbcopy6.d \ err.badchill.d \ err.chillbadarg.ksh \ err.copyout.d \ err.copyoutbadaddr.ksh \ err.copyoutstrbadaddr.ksh \ err.inet_ntoa6badaddr.d \ err.inet_ntoabadaddr.d \ err.inet_ntopbadaddr.d \ err.inet_ntopbadarg.d \ tst.badfreopen.ksh \ tst.basename.d \ tst.basename.d.out \ tst.bcopy.d \ tst.chill.ksh \ tst.cleanpath.d \ tst.cleanpath.d.out \ tst.copyin.d \ tst.copyinto.d \ tst.ddi_pathname.d \ tst.default.d \ tst.freopen.ksh \ tst.ftruncate.ksh \ tst.ftruncate.ksh.out \ tst.hton.d \ tst.index.d \ tst.index.d.out \ tst.inet_ntoa.d \ tst.inet_ntoa.d.out \ tst.inet_ntoa6.d \ tst.inet_ntoa6.d.out \ tst.inet_ntop.d \ tst.inet_ntop.d.out \ tst.lltostr.d \ tst.lltostr.d.out \ tst.lltostrbase.d \ tst.lltostrbase.d.out \ tst.mutex_owned.d \ tst.mutex_owner.d \ tst.mutex_type_adaptive.d \ tst.progenyof.d \ tst.rand.d \ tst.strchr.d \ tst.strchr.d.out \ tst.strjoin.d \ tst.strjoin.d.out \ tst.strstr.d \ tst.strstr.d.out \ tst.strtok.d \ tst.strtok.d.out \ tst.strtok_null.d \ tst.substr.d \ tst.substr.d.out \ tst.substrminate.d \ tst.substrminate.d.out \ tst.system.d \ tst.system.d.out \ tst.tolower.d \ tst.toupper.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile (revision 299094) @@ -1,20 +1,22 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ADDROF_LVAL.d \ err.D_EMPTY.empty.d \ tst.clauses.d \ tst.stmts.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/include/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/include/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/include/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.includefirst.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile (revision 299094) @@ -1,28 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DECL_IDRED.redef1.d \ err.D_DECL_IDRED.redef2.d \ err.D_IDENT_UNDEF.recur.d \ err.D_OP_INCOMPAT.baddef1.d \ err.D_OP_INCOMPAT.baddef2.d \ err.D_OP_INCOMPAT.badxlate.d \ tst.InlineDataAssign.d \ tst.InlineExpression.d \ tst.InlineKinds.d \ tst.InlineKinds.d.out \ tst.InlineTypedef.d \ tst.InlineWritableAssign.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/io/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/io/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/io/Makefile (revision 299094) @@ -1,18 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.fds.d \ tst.fds.d.out \ TESTEXES= \ CFILES= \ tst.fds.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile (revision 299094) @@ -1,36 +1,38 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.ipv4localicmp.ksh \ tst.ipv4localicmp.ksh.out \ tst.ipv4localtcp.ksh \ tst.ipv4localtcp.ksh.out \ tst.ipv4localudp.ksh \ tst.ipv4localudp.ksh.out \ tst.ipv4remoteicmp.ksh \ tst.ipv4remoteicmp.ksh.out \ tst.ipv4remotetcp.ksh \ tst.ipv4remotetcp.ksh.out \ tst.ipv4remoteudp.ksh \ tst.ipv4remoteudp.ksh.out \ tst.ipv6localicmp.ksh \ tst.ipv6localicmp.ksh.out \ tst.ipv6remoteicmp.ksh \ tst.ipv6remoteicmp.ksh.out \ tst.localtcpstate.ksh \ tst.localtcpstate.ksh.out \ tst.remotetcpstate.ksh \ tst.remotetcpstate.ksh.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile (revision 299094) @@ -1,44 +1,46 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.Abort.ksh \ tst.Abort.ksh.out \ tst.Bean.ksh \ tst.Bean.ksh.out \ tst.Close.ksh \ tst.Close.ksh.out \ tst.Drop.ksh \ tst.Drop.ksh.out \ tst.Enable.ksh \ tst.Enable.ksh.out \ tst.FunctionLookup.ksh \ tst.FunctionLookup.ksh.out \ tst.GetAggregate.ksh \ tst.MaxConsumers.ksh \ tst.MaxConsumers.ksh.out \ tst.MultiAggPrinta.ksh \ tst.MultiAggPrinta.ksh.out \ tst.ProbeData.ksh \ tst.ProbeData.ksh.out \ tst.ProbeDescription.ksh \ tst.ProbeDescription.ksh.out \ tst.StateMachine.ksh \ tst.StateMachine.ksh.out \ tst.StopLock.ksh \ tst.StopLock.ksh.out \ tst.printa.d \ tst.printa.d.out \ TESTEXES= \ CFILES= \ tst.FunctionLookup.c \ tst.ProbeData.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/json/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/json/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/json/Makefile (revision 299094) @@ -1,23 +1,25 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.general.d \ tst.general.d.out \ tst.strsize.d \ tst.strsize.d.out \ tst.usdt.d \ tst.usdt.d.out \ usdt.d \ TESTEXES= \ CFILES= \ tst.usdt.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile (revision 299094) @@ -1,30 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_CHR_NL.char.d \ err.D_CHR_NULL.char.d \ err.D_INT_DIGIT.InvalidDigit.d \ err.D_INT_OFLOW.BigInt.d \ err.D_STR_NL.string.d \ err.D_SYNTAX.brace1.d \ err.D_SYNTAX.brace2.d \ err.D_SYNTAX.brack1.d \ err.D_SYNTAX.brack2.d \ err.D_SYNTAX.brack3.d \ err.D_SYNTAX.paren1.d \ err.D_SYNTAX.paren2.d \ err.D_SYNTAX.paren3.d \ tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile (revision 299094) @@ -1,50 +1,52 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_LLQUANT_FACTOREVEN.nodivide.d \ err.D_LLQUANT_FACTOREVEN.notfactor.d \ err.D_LLQUANT_FACTORMATCH.d \ err.D_LLQUANT_FACTORNSTEPS.d \ err.D_LLQUANT_FACTORSMALL.d \ err.D_LLQUANT_FACTORTYPE.d \ err.D_LLQUANT_FACTORVAL.d \ err.D_LLQUANT_HIGHMATCH.d \ err.D_LLQUANT_HIGHTYPE.d \ err.D_LLQUANT_HIGHVAL.d \ err.D_LLQUANT_LOWMATCH.d \ err.D_LLQUANT_LOWTYPE.d \ err.D_LLQUANT_LOWVAL.d \ err.D_LLQUANT_MAGRANGE.d \ err.D_LLQUANT_MAGTOOBIG.d \ err.D_LLQUANT_NSTEPMATCH.d \ err.D_LLQUANT_NSTEPTYPE.d \ err.D_LLQUANT_NSTEPVAL.d \ tst.bases.d \ tst.bases.d.out \ tst.basic.d \ tst.basic.d.out \ tst.negorder.d \ tst.negorder.d.out \ tst.negvalue.d \ tst.negvalue.d.out \ tst.normal.d \ tst.normal.d.out \ tst.range.d \ tst.range.d.out \ tst.steps.d \ tst.steps.d.out \ tst.trunc.d \ tst.trunc.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.dtracedcmd.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.icmp.ksh \ tst.tcp.ksh \ tst.udp.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile (revision 299094) @@ -1,30 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRAGMA_OPTSET.d \ tst.badopt.d \ tst.boolopt.d \ tst.boolopt.d.out \ tst.dofmax.ksh \ tst.dynopt.d \ tst.dynopt.d.out \ tst.enablerace.ksh \ tst.haslam.d \ tst.include.ksh \ tst.macroglob.ksh \ tst.macroglob.ksh.out \ tst.roch.d \ tst.schrock.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile (revision 299094) @@ -1,34 +1,36 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRINTA_AGGKEY.d \ err.D_PRINTA_AGGPROTO.d \ tst.many.d \ tst.many.d.out \ tst.same.d \ tst.same.d.out \ tst.sort.d \ tst.sort.d.out \ tst.sortpos.d \ tst.sortpos.d.out \ tst.tuplecompat.d \ tst.tuplecompat.d.out \ tst.zero.d \ tst.zero.d.out \ tst.zero2.d \ tst.zero2.d.out \ tst.zero3.d \ tst.zero3.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.call.d \ tst.call3.d \ TESTEXES= \ CFILES= \ tst.call.c \ tst.call3.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile (revision 299094) @@ -1,28 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_OFFSETOF_BITFIELD.bitfield.d \ err.D_OFFSETOF_TYPE.badtype.d \ err.D_OFFSETOF_TYPE.notsou.d \ err.D_UNKNOWN.OffsetofNULL.d \ err.D_UNKNOWN.badmemb.d \ tst.OffsetofAlias.d \ tst.OffsetofArith.d \ tst.OffsetofUnion.d \ tst.struct.d \ tst.struct.d.out \ tst.union.d \ tst.union.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile (revision 299094) @@ -1,18 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.ternary.d \ tst.ternary.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile (revision 299094) @@ -1,69 +1,71 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.badlib.d \ err.D_PDESC_ZERO.badproc1.d \ err.D_PROC_BADPID.badproc2.d \ err.D_PROC_CREATEFAIL.many.d \ err.D_PROC_FUNC.badfunc.d \ err.D_PROC_LIB.libdash.d \ err.D_PROC_NAME.alldash.d \ err.D_PROC_NAME.badname.d \ err.D_PROC_NAME.globdash.d \ err.D_PROC_OFF.toobig.d \ tst.addprobes.ksh \ tst.args1.d \ tst.coverage.d \ tst.emptystack.d \ tst.emptystack.d.out \ tst.float.d \ tst.fork.d \ tst.gcc.d \ tst.killonerror.ksh \ tst.main.ksh \ tst.manypids.ksh \ tst.newprobes.ksh \ tst.newprobes.ksh.out \ tst.probemod.ksh \ tst.provregex1.ksh \ tst.provregex2.ksh \ tst.provregex2.ksh.out \ tst.provregex3.ksh \ tst.provregex3.ksh.out \ tst.provregex4.ksh \ tst.provregex4.ksh.out \ tst.ret1.d \ tst.ret2.d \ tst.vfork.d \ tst.weak1.d \ tst.weak2.d \ TESTEXES= \ err.D_PDESC_ZERO.badlib.exe \ err.D_PROC_CREATEFAIL.many.exe \ err.D_PROC_FUNC.badfunc.exe \ err.D_PROC_LIB.libdash.exe \ err.D_PROC_NAME.alldash.exe \ err.D_PROC_NAME.badname.exe \ err.D_PROC_NAME.globdash.exe \ err.D_PROC_OFF.toobig.exe \ tst.coverage.exe \ tst.emptystack.exe \ CFILES= \ tst.args1.c \ tst.float.c \ tst.fork.c \ tst.gcc.c \ tst.ret1.c \ tst.ret2.c \ tst.vfork.c \ tst.weak1.c \ tst.weak2.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.available.d \ tst.libmap.d \ TESTEXES= \ tst.available.exe \ tst.libmap.exe \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile (revision 299094) @@ -1,48 +1,50 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.BadAlign.d \ err.D_ADDROF_VAR.ArrayVar.d \ err.D_ADDROF_VAR.DynamicVar.d \ err.D_ADDROF_VAR.agg.d \ err.D_DEREF_NONPTR.noptr.d \ err.D_DEREF_VOID.VoidPointerDeref.d \ err.D_OP_ARRFUN.ArrayAssignment.d \ err.D_OP_INCOMPAT.VoidPointerArith.d \ err.D_OP_LVAL.AddressChange.d \ err.D_OP_PTR.NonPointerAccess.d \ err.D_OP_PTR.badpointer.d \ err.D_OP_SOU.BadPointerAccess.d \ err.D_OP_SOU.badpointer.d \ err.InvalidAddress1.d \ err.InvalidAddress2.d \ err.InvalidAddress3.d \ err.InvalidAddress4.d \ err.InvalidAddress5.d \ tst.ArrayPointer1.d \ tst.ArrayPointer2.d \ tst.ArrayPointer3.d \ tst.GlobalVar.d \ tst.IntegerArithmetic1.d \ tst.PointerArithmetic1.d \ tst.PointerArithmetic2.d \ tst.PointerArithmetic3.d \ tst.PointerAssignment.d \ tst.ValidPointer1.d \ tst.ValidPointer2.d \ tst.VoidCast.d \ tst.basic1.d \ tst.basic2.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile (revision 299094) @@ -1,30 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRAGERR.d \ err.D_PRAGMA_DEPEND.main.d \ err.D_PRAGMA_INVAL.d \ err.D_PRAGMA_MALFORM.d \ err.D_PRAGMA_UNUSED.UnusedPragma.d \ err.circlibdep.ksh \ err.invalidlibdep.ksh \ tst.libchain.ksh \ tst.libdep.ksh \ tst.libdepfullyconnected.ksh \ tst.libdepsepdir.ksh \ tst.temporal.ksh \ tst.temporal2.ksh \ tst.temporal3.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile (revision 299094) @@ -1,25 +1,27 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRED_SCALAR.NonScalarPred.d \ err.D_SYNTAX.invalid.d \ err.D_SYNTAX.operr.d \ tst.argsnotcached.d \ tst.basics.d \ tst.basics.d.out \ tst.complex.d \ tst.complex.d.out \ tst.predcache.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile (revision 299094) @@ -1,53 +1,55 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_IDENT_UNDEF.afterprobe.d \ err.D_PRAGCTL_INVAL.tabdefine.d \ err.D_SYNTAX.withoutpound.d \ err.defincomp.d \ err.ifdefelsenotendif.d \ err.ifdefincomp.d \ err.ifdefnotendif.d \ err.incompelse.d \ err.mulelse.d \ tst.ifdef.d \ tst.ifdef.d.out \ tst.ifndef.d \ tst.ifndef.d.out \ tst.ifnotdef.d \ tst.ifnotdef.d.out \ tst.logicaland.d \ tst.logicaland.d.out \ tst.logicalandor.d \ tst.logicalandor.d.out \ tst.logicalor.d \ tst.logicalor.d.out \ tst.muland.d \ tst.muland.d.out \ tst.mulor.d \ tst.mulor.d.out \ tst.precondi.d \ tst.precondi.d.out \ tst.predicatedeclare.d \ tst.preexp.d \ tst.preexp.d.out \ tst.preexpelse.d \ tst.preexpelse.d.out \ tst.preexpif.d \ tst.preexpif.d.out \ tst.preexpifelse.d \ tst.preexpifelse.d.out \ tst.withinprobe.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/print/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/print/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/print/Makefile (revision 299094) @@ -1,32 +1,34 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRINT_AGG.bad.d \ err.D_PRINT_VOID.bad.d \ err.D_PROTO_LEN.bad.d \ tst.array.d \ tst.array.d.out \ tst.bitfield.d \ tst.bitfield.d.out \ tst.dyn.d \ tst.enum.d \ tst.enum.d.out \ tst.primitive.d \ tst.primitive.d.out \ tst.struct.d \ tst.struct.d.out \ tst.xlate.d \ tst.xlate.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile (revision 299094) @@ -1,40 +1,42 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRINTA_AGGARG.badagg.d \ err.D_PRINTA_AGGARG.badfmt.d \ err.D_PRINTA_AGGARG.badval.d \ err.D_PRINTA_PROTO.bad.d \ err.D_PRINTF_ARG_TYPE.jstack.d \ err.D_PRINTF_ARG_TYPE.stack.d \ err.D_PRINTF_ARG_TYPE.ustack.d \ tst.basics.d \ tst.basics.d.out \ tst.def.d \ tst.def.d.out \ tst.dynwidth.d \ tst.dynwidth.d.out \ tst.fmt.d \ tst.fmt.d.out \ tst.largeusersym.ksh \ tst.many.d \ tst.manyval.d \ tst.manyval.d.out \ tst.stack.d \ tst.tuple.d \ tst.tuple.d.out \ tst.walltimestamp.ksh \ tst.walltimestamp.ksh.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile (revision 299094) @@ -1,68 +1,70 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PRINTF_AGG_CONV.aggfmt.d \ err.D_PRINTF_ARG_EXTRA.toomany.d \ err.D_PRINTF_ARG_EXTRA.widths.d \ err.D_PRINTF_ARG_FMT.badfmt.d \ err.D_PRINTF_ARG_PROTO.novalue.d \ err.D_PRINTF_ARG_TYPE.aggarg.d \ err.D_PRINTF_ARG_TYPE.recursive.d \ err.D_PRINTF_DYN_PROTO.noprec.d \ err.D_PRINTF_DYN_PROTO.nowidth.d \ err.D_PRINTF_DYN_TYPE.badprec.d \ err.D_PRINTF_DYN_TYPE.badwidth.d \ err.D_PROTO_LEN.toofew.d \ err.D_SYNTAX.badconv1.d \ err.D_SYNTAX.badconv2.d \ err.D_SYNTAX.badconv3.d \ tst.basics.d \ tst.basics.d.out \ tst.flags.d \ tst.flags.d.out \ tst.hello.d \ tst.hello.d.out \ tst.ints.d \ tst.ints.d.out \ tst.precs.d \ tst.precs.d.out \ tst.print-f.d \ tst.print-f.d.out \ tst.printT.ksh \ tst.printT.ksh.out \ tst.printY.ksh \ tst.printY.ksh.out \ tst.printcont.d \ tst.printcont.d.out \ tst.printeE.d \ tst.printeE.d.out \ tst.printgG.d \ tst.printgG.d.out \ tst.rawfmt.d \ tst.rawfmt.d.out \ tst.signs.d \ tst.signs.d.out \ tst.str.d \ tst.str.d.out \ tst.sym.d \ tst.sym.d.out \ tst.uints.d \ tst.uints.d.out \ tst.widths.d \ tst.widths.d.out \ tst.widths1.d \ tst.wp.d \ tst.wp.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile (revision 299094) @@ -1,24 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.fds.ksh \ tst.func_access.ksh \ tst.getf.ksh \ tst.kpriv.ksh \ tst.op_access.ksh \ tst.procpriv.ksh \ tst.providers.ksh \ tst.unpriv_funcs.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile (revision 299094) @@ -1,36 +1,38 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.probeqtn.d \ err.D_PDESC_ZERO.probestar.d \ err.D_PDESC_ZERO.tickstar.d \ err.D_SYNTAX.assign.d \ err.D_SYNTAX.declare.d \ err.D_SYNTAX.declarein.d \ err.D_SYNTAX.lbraces.d \ err.D_SYNTAX.probespec.d \ err.D_SYNTAX.rbraces.d \ err.D_SYNTAX.recdec.d \ tst.basic1.d \ tst.check.d \ tst.declare.d \ tst.declareafter.d \ tst.emptyprobe.d \ tst.pragma.d \ tst.pragmaaftertab.d \ tst.pragmainside.d \ tst.pragmaoutside.d \ tst.probestar.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 299094) @@ -1,29 +1,31 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.create.ksh \ tst.discard.ksh \ tst.exec.ksh \ tst.execfail.ENOENT.ksh \ tst.execfail.ksh \ tst.exitcore.ksh \ tst.exitexit.ksh \ tst.exitkilled.ksh \ tst.signal.ksh \ tst.sigwait.d \ tst.startexit.ksh \ TESTEXES= \ CFILES= \ tst.sigwait.c \ LIBADD.tst.sigwait.exe+= rt .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile (revision 299094) @@ -1,53 +1,55 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.profile.d \ err.D_PDESC_ZEROonens.d \ err.D_PDESC_ZEROonensec.d \ err.D_PDESC_ZEROoneus.d \ err.D_PDESC_ZEROoneusec.d \ tst.argtest.d \ tst.argtest.d.out \ tst.basic.d \ tst.basic.d.out \ tst.func.ksh \ tst.mod.ksh \ tst.profilehz.d \ tst.profilehz.d.out \ tst.profilems.d \ tst.profilems.d.out \ tst.profilemsec.d \ tst.profilemsec.d.out \ tst.profilenhz.d \ tst.profilenhz.d.out \ tst.profilens.d \ tst.profilens.d.out \ tst.profilensec.d \ tst.profilensec.d.out \ tst.profiles.d \ tst.profiles.d.out \ tst.profilesec.d \ tst.profilesec.d.out \ tst.profileus.d \ tst.profileus.d.out \ tst.profileusec.d \ tst.profileusec.d.out \ tst.sym.ksh \ tst.ufunc.ksh \ tst.ufuncsort.ksh \ tst.ufuncsort.ksh.out \ tst.umod.ksh \ tst.usym.ksh \ TESTEXES= \ CFILES= \ tst.ufuncsort.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile (revision 299094) @@ -1,44 +1,46 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_INVAL.wrongdec4.d \ err.D_PDESC_ZERO.nonprofile.d \ err.D_PDESC_ZERO.wrongdec1.d \ err.D_PDESC_ZERO.wrongdec2.d \ err.D_PDESC_ZERO.wrongdec3.d \ tst.basics.d \ tst.basics.d.out \ tst.beginexit.d \ tst.beginprof.d \ tst.beginprof.d.out \ tst.probattrs.d \ tst.probattrs.d.out \ tst.probefunc.d \ tst.probefunc.d.out \ tst.probemod.d \ tst.probemod.d.out \ tst.probename.d \ tst.probename.d.out \ tst.probprov.d \ tst.probprov.d.out \ tst.profend.d \ tst.profend.d.out \ tst.profexit.d \ tst.profexit.d.out \ tst.trace.d \ tst.trace.d.out \ tst.twoprof.d \ tst.twoprof.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.raise1.d \ tst.raise2.d \ tst.raise3.d \ TESTEXES= \ CFILES= \ tst.raise1.c \ tst.raise2.c \ tst.raise3.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.aggrate.d \ tst.aggrate.d.out \ tst.statusrate.d \ tst.switchrate.d \ tst.switchrate.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile (revision 299094) @@ -1,54 +1,56 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.basename.d \ tst.caller.d \ tst.cleanpath.d \ tst.copyin.d \ tst.copyin2.d \ tst.ddi_pathname.d \ tst.dirname.d \ tst.errno.d \ tst.execname.d \ tst.gid.d \ tst.hton.d \ tst.index.d \ tst.msgdsize.d \ tst.msgsize.d \ tst.null.d \ tst.pid.d \ tst.ppid.d \ tst.progenyof.d \ tst.random.d \ tst.rw.d \ tst.shortstr.d \ tst.stack.d \ tst.stackdepth.d \ tst.stddev.d \ tst.strchr.d \ tst.strjoin.d \ tst.strstr.d \ tst.strtok.d \ tst.substr.d \ tst.ucaller.d \ tst.uid.d \ tst.unalign.d \ tst.uregs.d \ tst.ustack.d \ tst.ustackdepth.d \ tst.vahole.d \ tst.violentdeath.ksh \ tst.zonename.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile (revision 299094) @@ -1,37 +1,39 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ARR_LOCAL.thisarray.d \ err.D_DECL_CLASS.selfthis.d \ err.D_DECL_CLASS.thisself.d \ err.D_DECL_IDRED.errval.d \ err.D_OP_INCOMPAT.dec.err.d \ err.D_OP_INCOMPAT.dupgtype.d \ err.D_OP_INCOMPAT.dupltype.d \ err.D_OP_INCOMPAT.dupttype.d \ err.D_SYNTAX.declare.d \ err.bigglobal.d \ err.biglocal.d \ tst.basicvar.d \ tst.basicvar.d.out \ tst.localvar.d \ tst.misc.d \ tst.self.d \ tst.selfarray.d \ tst.selfarray2.d \ tst.selfthis.d \ tst.this.d \ tst.thisself.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.enqueue.d \ tst.oncpu.d \ tst.stackdepth.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile (revision 299094) @@ -1,49 +1,51 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_MACRO_UNDEF.invalidargs.d \ err.D_OP_LVAL.rdonly.d \ err.D_OP_WRITE.usepidmacro.d \ err.D_SYNTAX.concat.d \ err.D_SYNTAX.desc.d \ err.D_SYNTAX.inval.d \ err.D_SYNTAX.pid.d \ tst.D_MACRO_UNUSED.overflow.ksh \ tst.arg0.d \ tst.arguments.ksh \ tst.assign.d \ tst.basic.d \ tst.egid.d \ tst.egid.ksh \ tst.euid.d \ tst.euid.ksh \ tst.gid.d \ tst.gid.ksh \ tst.pgid.d \ tst.pid.d \ tst.ppid.d \ tst.ppid.ksh \ tst.projid.d \ tst.projid.ksh \ tst.quite.d \ tst.sid.d \ tst.sid.ksh \ tst.stringmacro.ksh \ tst.taskid.d \ tst.taskid.ksh \ tst.trace.d \ tst.uid.d \ tst.uid.ksh \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.sdtargs.d \ TESTEXES= \ CFILES= \ tst.sdtargs.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile (revision 299094) @@ -1,31 +1,33 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_IDENT_BADREF.SizeofAssoc.d \ err.D_IDENT_UNDEF.UnknownSymbol.d \ err.D_SIZEOF_TYPE.badstruct.d \ err.D_SIZEOF_TYPE.d \ err.D_SYNTAX.SizeofBadType.d \ tst.SizeofArray.d \ tst.SizeofDataTypes.d \ tst.SizeofExpression.d \ tst.SizeofNULL.d \ tst.SizeofStrConst.d \ tst.SizeofStrConst.d.out \ tst.SizeofString1.d \ tst.SizeofString1.d.out \ tst.SizeofString2.d \ tst.SizeofString2.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile (revision 299094) @@ -1,75 +1,77 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ bug.1001148.SpecSizeVariations.d \ err.BufSizeVariations1.d \ err.BufSizeVariations2.d \ err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ err.D_ACT_SPEC.SpeculateWithChill.d \ err.D_ACT_SPEC.SpeculateWithCopyOut.d \ err.D_ACT_SPEC.SpeculateWithCopyOutStr.d \ err.D_ACT_SPEC.SpeculateWithPanic.d \ err.D_ACT_SPEC.SpeculateWithRaise.d \ err.D_ACT_SPEC.SpeculateWithStop.d \ err.D_AGG_COMM.AggAftCommit.d \ err.D_AGG_SPEC.SpeculateWithAvg.d \ err.D_AGG_SPEC.SpeculateWithCount.d \ err.D_AGG_SPEC.SpeculateWithLquant.d \ err.D_AGG_SPEC.SpeculateWithMax.d \ err.D_AGG_SPEC.SpeculateWithMin.d \ err.D_AGG_SPEC.SpeculateWithQuant.d \ err.D_AGG_SPEC.SpeculateWithStddev.d \ err.D_AGG_SPEC.SpeculateWithSum.d \ err.D_COMM_COMM.CommitAftCommit.d \ err.D_COMM_COMM.DisjointCommit.d \ err.D_COMM_DREC.CommitAftDataRec.d \ err.D_DREC_COMM.DataRecAftCommit.d \ err.D_DREC_COMM.ExitAfterCommit.d \ err.D_EXIT_SPEC.ExitAftSpec.d \ err.D_PRAGMA_MALFORM.NspecExpr.d \ err.D_PRAGMA_OPTSET.HugeNspecValue.d \ err.D_PRAGMA_OPTSET.InvalidSpecSize.d \ err.D_PRAGMA_OPTSET.NegSpecSize.d \ err.D_PROTO_LEN.SpecNoId.d \ err.D_SPEC_COMM.SpecAftCommit.d \ err.D_SPEC_DREC.SpecAftDataRec.d \ err.D_SPEC_SPEC.SpecAftSpec.d \ err.NegativeBufSize.d \ err.NegativeNspec.d \ err.NegativeSpecSize.d \ err.SpecSizeVariations1.d \ err.SpecSizeVariations2.d \ tst.CommitAfterDiscard.d \ tst.CommitWithZero.d \ tst.DataRecAftDiscard.d \ tst.DiscardAftCommit.d \ tst.DiscardAftDataRec.d \ tst.DiscardAftDiscard.d \ tst.DiscardWithZero.d \ tst.ExitAftDiscard.d \ tst.NoSpecBuffer.d \ tst.SpecSizeVariations1.d \ tst.SpecSizeVariations2.d \ tst.SpecSizeVariations3.d \ tst.SpeculateWithRandom.d \ tst.SpeculationCommit.d \ tst.SpeculationDiscard.d \ tst.SpeculationID.d \ tst.SpeculationWithZero.d \ tst.TwoSpecBuffers.d \ tst.negcommit.d \ tst.negspec.d \ tst.zerosize.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ATTR_MIN.MinAttributes.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile (revision 299094) @@ -1,22 +1,24 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_STACK_PROTO.bad.d \ err.D_STACK_SIZE.d \ err.D_USTACK_FRAMES.bad.d \ err.D_USTACK_PROTO.bad.d \ err.D_USTACK_STRSIZE.bad.d \ tst.default.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.default.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.stop1.d \ tst.stop2.d \ TESTEXES= \ CFILES= \ tst.stop1.c \ tst.stop2.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.strlen1.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile (revision 299094) @@ -1,20 +1,22 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.BaseTooLarge.d \ err.BaseTooSmall.d \ tst.strtoll.d \ tst.strtoll.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile (revision 299094) @@ -1,31 +1,33 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ADDROF_VAR.StructPointer.d \ err.D_DECL_COMBO.StructWithoutColon.d \ err.D_DECL_COMBO.StructWithoutColon1.d \ err.D_DECL_INCOMPLETE.circular.d \ err.D_DECL_INCOMPLETE.order.d \ err.D_DECL_INCOMPLETE.order2.d \ err.D_DECL_INCOMPLETE.recursive.d \ err.D_DECL_INCOMPLETE.simple.d \ err.D_DECL_VOIDOBJ.baddec.d \ err.D_PROTO_ARG.DupStructAssoc.d \ tst.StructAssoc.d \ tst.StructDataTypes.d \ tst.StructInside.d \ tst.clauselocal.d \ tst.clauselocal.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile (revision 299094) @@ -1,18 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.args.d \ tst.openret.ksh \ TESTEXES= \ CFILES= \ tst.args.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile (revision 299094) @@ -1,19 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.post.d \ tst.post_chan.d \ TESTEXES= \ CFILES= \ tst.post.c \ tst.post_chan.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile (revision 299094) @@ -1,38 +1,40 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PDESC_ZERO.tick.d \ err.D_PDESC_ZEROonens.d \ err.D_PDESC_ZEROonensec.d \ err.D_PDESC_ZEROoneus.d \ err.D_PDESC_ZEROoneusec.d \ tst.tickarg0.d \ tst.tickms.d \ tst.tickms.d.out \ tst.tickmsec.d \ tst.tickmsec.d.out \ tst.tickns.d \ tst.tickns.d.out \ tst.ticknsec.d \ tst.ticknsec.d.out \ tst.ticks.d \ tst.ticks.d.out \ tst.ticksec.d \ tst.ticksec.d.out \ tst.tickus.d \ tst.tickus.d.out \ tst.tickusec.d \ tst.tickusec.d.out \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile (revision 299094) @@ -1,24 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PROTO_LEN.bad.d \ err.D_TRACE_AGG.bad.d \ err.D_TRACE_VOID.bad.d \ tst.dyn.d \ tst.misc.d \ tst.qstring.d \ tst.qstring.d.out \ tst.string.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile (revision 299094) @@ -1,26 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_PROTO_ARG.badsize.d \ err.D_PROTO_LEN.toofew.d \ err.D_TRACEMEM_ADDR.badaddr.d \ err.D_TRACEMEM_ARGS.d \ err.D_TRACEMEM_DYNSIZE.d \ err.D_TRACEMEM_SIZE.negsize.d \ err.D_TRACEMEM_SIZE.zerosize.d \ tst.dynsize.d \ tst.dynsize.d.out \ tst.rootvp.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile (revision 299094) @@ -1,51 +1,53 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DECL_TYPERED.BadTransDecl.d \ err.D_OP_INCOMPLETE.NonExistentInput1.d \ err.D_SYNTAX.BadTransDecl1.d \ err.D_SYNTAX.BadTransDecl3.d \ err.D_SYNTAX.BadTransDecl4.d \ err.D_TYPE_MEMBER.NonExistentInput2.d \ err.D_XLATE_INCOMPAT.BadInputType1.d \ err.D_XLATE_MEMB.NonExistentOutput2.d \ err.D_XLATE_NONE.BadTransDecl6.d \ err.D_XLATE_REDECL.RepeatTransDecl.d \ err.D_XLATE_SOU.BadTransDecl8.d \ err.D_XLATE_SOU.BadTransInt.d \ err.D_XLATE_SOU.NonExistentOutput1.d \ tst.CircularTransDecl.d \ tst.EmptyTransDecl.d \ tst.ForwardTag.d \ tst.InputAliasTrans.d \ tst.InputIntTrans.d \ tst.OutputAliasTrans.d \ tst.PartialDereferencing.d \ tst.PartialOutputTransDefn.d \ tst.ProcModelTrans.d \ tst.RepeatDeclaration.d \ tst.SimultaneousTranslators.d \ tst.StructureAssignment.d \ tst.TestTransStability1.ksh \ tst.TestTransStability1.ksh.out \ tst.TestTransStability2.ksh \ tst.TestTransStability2.ksh.out \ tst.TransNonPointer.d \ tst.TransOutputPointer.d \ tst.TransPointer.d \ tst.TranslateSelf.d \ tst.UnionInputTrans.d \ tst.UnionOutputTrans.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile (revision 299094) @@ -1,21 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_DECL_IDRED.DupTypeDef.d \ err.D_SYNTAX.BadExistingTypedef.d \ err.D_SYNTAX.TypedefInClause.d \ tst.ChainTypedef.d \ tst.TypedefDataAssign.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/types/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/types/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/types/Makefile (revision 299094) @@ -1,69 +1,71 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_CAST_INVAL.badcast.d \ err.D_CG_DYN.ResultDynType.d \ err.D_CHR_OFLOW.charconst.d \ err.D_DECL_BADCLASS.bad.d \ err.D_DECL_CHARATTR.badtype3.d \ err.D_DECL_COMBO.badtype4.d \ err.D_DECL_COMBO.badtype5.d \ err.D_DECL_ENCONST.badeval.d \ err.D_DECL_ENOFLOW.enoflow.d \ err.D_DECL_ENOFLOW.enuflow.d \ err.D_DECL_SCOPE.scopeop.d \ err.D_DECL_USELESS.baddec.d \ err.D_OP_ACT.badcond.d \ err.D_OP_ARITH.badoperand.d \ err.D_OP_INCOMPAT.badassign.d \ err.D_OP_INT.badbitop.d \ err.D_OP_INT.badshift.d \ err.D_OP_SCALAR.badcond.d \ err.D_OP_SCALAR.badincop.d \ err.D_OP_SCALAR.badlogop.d \ err.D_PROTO_LEN.badcond1.d \ err.D_SYNTAX.badenum.d \ err.D_SYNTAX.badid.d \ err.D_SYNTAX.badstruct.d \ err.D_UNKNOWN.badtype1.d \ err.D_UNKNOWN.badtype2.d \ err.D_UNKNOWN.dupenum.d \ err.D_UNKNOWN.dupstruct.d \ err.D_XLATE_REDECL.ResultDynType.d \ tst.assignops.d \ tst.badshiftops.d \ tst.basics.d \ tst.basics.d.out \ tst.bitops.d \ tst.charconstants.d \ tst.complex.d \ tst.condexpr.d \ tst.const.d \ tst.constants.d \ tst.conv.d \ tst.enum.d \ tst.intincop.d \ tst.intops.d \ tst.inttypes.d \ tst.ptrincop.d \ tst.ptrops.d \ tst.relenum.d \ tst.relstring.d \ tst.shiftops.d \ tst.stringconstants.d \ tst.struct.d \ tst.typedef.d \ tst.unaryop.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile (revision 299094) @@ -1,41 +1,43 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.invalidpid.d \ err.invalidpid2.d \ err.invalidpid3.d \ err.invalidtype.ksh \ err.invalidtype2.ksh \ err.user64mode.ksh \ tst.aouttype.ksh \ tst.chasestrings.ksh \ tst.chasestrings.ksh.out \ tst.libtype.ksh \ tst.linkmap.ksh \ tst.pidprint.ksh \ tst.pidprinttarg.ksh \ tst.printtype.ksh \ tst.printtype.ksh.out \ tst.printtypetarg.ksh \ tst.userlandkey.ksh \ tst.userlandkey.ksh.out \ tst.userstrings.ksh \ tst.userstrings.ksh.out \ TESTEXES= \ CFILES= \ tst.aouttype.c \ tst.chasestrings.c \ tst.libtype.c \ tst.printtype.c \ WITH_CTF=YES .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/union/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/union/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/union/Makefile (revision 299094) @@ -1,27 +1,29 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ err.D_ADDROF_VAR.UnionPointer.d \ err.D_DECL_COMBO.UnionWithoutColon.d \ err.D_DECL_COMBO.UnionWithoutColon1.d \ err.D_DECL_INCOMPLETE.circular.d \ err.D_DECL_INCOMPLETE.order.d \ err.D_DECL_INCOMPLETE.recursive.d \ err.D_DECL_INCOMPLETE.simple.d \ err.D_PROTO_ARG.DupUnionAssoc.d \ tst.UnionAssoc.d \ tst.UnionDataTypes.d \ tst.UnionInside.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile (revision 299094) @@ -1,67 +1,69 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ argmap.d \ args.d \ forker.d \ prov.d \ tst.andpid.ksh \ tst.argmap.d \ tst.args.d \ tst.badguess.ksh \ tst.corruptenv.ksh \ tst.dlclose1.ksh \ tst.dlclose1.ksh.out \ tst.dlclose2.ksh \ tst.dlclose2.ksh.out \ tst.dlclose3.ksh \ tst.eliminate.ksh \ tst.enabled.ksh \ tst.enabled.ksh.out \ tst.enabled2.ksh \ tst.enabled2.ksh.out \ tst.entryreturn.ksh \ tst.entryreturn.ksh.out \ tst.fork.ksh \ tst.fork.ksh.out \ tst.forker.ksh \ tst.guess32.ksh \ tst.guess64.ksh \ tst.header.ksh \ tst.include.ksh \ tst.linkpriv.ksh \ tst.linkunpriv.ksh \ tst.multiple.ksh \ tst.multiple.ksh.out \ tst.multiprov.ksh \ tst.multiprov.ksh.out \ tst.nodtrace.ksh \ tst.noprobes.ksh \ tst.noreap.ksh \ tst.noreapring.ksh \ tst.onlyenabled.ksh \ tst.reap.ksh \ tst.reeval.ksh \ tst.sameprovmulti.ksh \ tst.sameprovmulti.ksh.out \ tst.static.ksh \ tst.static.ksh.out \ tst.static2.ksh \ tst.static2.ksh.out \ tst.user.ksh \ tst.user.ksh.out \ TESTEXES= \ CFILES= \ tst.argmap.c \ tst.args.c \ tst.forker.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile (revision 299094) @@ -1,20 +1,22 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.bigstack.d \ tst.depth.ksh \ tst.spin.ksh \ TESTEXES= \ CFILES= \ tst.bigstack.c \ tst.spin.c \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile (revision 299094) @@ -1,23 +1,25 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.gid.d \ tst.nullassign.d \ tst.ppid.d \ tst.ucaller.ksh \ tst.ucaller.ksh.out \ tst.uid.d \ tst.walltimestamp.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/version/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/version/Makefile (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/common/version/Makefile (revision 299094) @@ -1,17 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.1.0.d \ TESTEXES= \ CFILES= \ .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk =================================================================== --- head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (revision 299094) @@ -1,48 +1,48 @@ # $FreeBSD$ TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} -TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} +TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} -FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE +FILESGROUPS+= ${TESTGROUP}EXE -${TESTGROUP}= ${TESTFILES} ${TESTGROUP}EXE= ${TESTEXES} ${TESTGROUP}EXEMODE= 0555 +${TESTGROUP}EXEPACKAGE= ${PACKAGE} TESTWRAPPER= t_dtrace_contrib ATF_TESTS_SH+= ${TESTWRAPPER} TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" TEST_METADATA.t_dtrace_contrib+= required_user="root" GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh -${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}} +${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES} sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} CLEANFILES+= ${TESTWRAPPER}.sh .PATH: ${TESTSRC} PROGS= ${CFILES:T:S/.c$/.exe/g} .for prog in ${PROGS} SRCS.${prog}+= ${prog:S/.exe$/.c/} .if exists(${prog:S/^tst.//:S/.exe$/.d/}) SRCS.${prog}+= ${prog:S/^tst.//:S/.exe$/.d/} .endif .endfor BINDIR= ${TESTSDIR} MAN= # Some tests depend on the internals of their corresponding test programs, # so make sure the optimizer doesn't interfere with them. CFLAGS+= -O0 # Test programs shouldn't be stripped; else we generally can't use the PID # provider. DEBUG_FLAGS= -g STRIP= .include Index: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh =================================================================== --- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 299093) +++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 299094) @@ -1,84 +1,86 @@ # $FreeBSD$ usage() { cat <<__EOF__ >&2 usage: $(basename $0) This script regenerates the DTrace test suite makefiles. It should be run whenever \$srcdir/cddl/contrib/opensolaris/cmd/dtrace/test/tst is modified. __EOF__ exit 1 } # Format a file list for use in a make(1) variable assignment: take the # basename of each input file and append " \" to it. fmtflist() { awk 'function bn(f) { sub(".*/", "", f) return f } {print " ", bn($1), " \\"}' } genmakefile() { local basedir=$1 local tdir=${CONTRIB_TESTDIR}/${basedir} local tfiles=$(find $tdir -type f -a \ \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist) local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist) local texes=$(find $tdir -type f -a -name \*.exe | sort | fmtflist) # One-off variable definitions. local special if [ "$basedir" = proc ]; then special=" LIBADD.tst.sigwait.exe+= rt " elif [ "$basedir" = uctf ]; then special=" WITH_CTF=YES " fi local makefile=$(mktemp) cat <<__EOF__ > $makefile # \$FreeBSD$ # # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh. # -TESTFILES= \\ +PACKAGE= tests + +\${PACKAGE}FILES= \\ $tfiles TESTEXES= \\ $texes CFILES= \\ $tcfiles $special .include "../../dtrace.test.mk" __EOF__ mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile } set -e if [ $# -ne 0 ]; then usage fi readonly ORIGINDIR=$(realpath $(dirname $0)) readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..) readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common # Generate a Makefile for each test group under common/. for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do genmakefile $(basename $dir) done Index: head/cddl/usr.sbin/tests/Makefile =================================================================== --- head/cddl/usr.sbin/tests/Makefile (revision 299093) +++ head/cddl/usr.sbin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/lib/tests/Makefile =================================================================== --- head/gnu/lib/tests/Makefile (revision 299093) +++ head/gnu/lib/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/tests/Makefile =================================================================== --- head/gnu/tests/Makefile (revision 299093) +++ head/gnu/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/usr.bin/diff/tests/Makefile =================================================================== --- head/gnu/usr.bin/diff/tests/Makefile (revision 299093) +++ head/gnu/usr.bin/diff/tests/Makefile (revision 299094) @@ -1,18 +1,15 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff NETBSD_ATF_TESTS_SH= diff_test ATF_TESTS_SH_SED_diff_test= -e 's/t_diff/`basename $$0`/g' -FILESDIR= ${TESTSDIR} -FILES+= d_mallocv1.in -FILES+= d_mallocv2.in +${PACKAGE}FILES+= d_mallocv1.in +${PACKAGE}FILES+= d_mallocv2.in .include .include Index: head/gnu/usr.bin/tests/Makefile =================================================================== --- head/gnu/usr.bin/tests/Makefile (revision 299093) +++ head/gnu/usr.bin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/lib/atf/libatf-c/tests/Makefile =================================================================== --- head/lib/atf/libatf-c/tests/Makefile (revision 299093) +++ head/lib/atf/libatf-c/tests/Makefile (revision 299094) @@ -1,39 +1,36 @@ # $FreeBSD$ .include PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c .PATH: ${ATF}/atf-c/detail CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} # macros_test.c contains a double 'const const' which will be gone with # the import of atf-0.18. # TODO(jmmv): Remove this workaround once we do that update. CFLAGS.clang+= -Wno-duplicate-decl-specifier -FILESDIR= ${TESTSDIR} -FILES= macros_h_test.c -FILES+= unused_test.c +${PACKAGE}FILES+= macros_h_test.c +${PACKAGE}FILES+= unused_test.c .for _T in atf_c_test \ build_test \ check_test \ error_test \ macros_test \ tc_test \ tp_test \ utils_test ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor .include Index: head/lib/atf/libatf-c/tests/detail/Makefile =================================================================== --- head/lib/atf/libatf-c/tests/detail/Makefile (revision 299093) +++ head/lib/atf/libatf-c/tests/detail/Makefile (revision 299094) @@ -1,41 +1,35 @@ # $FreeBSD$ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c/detail CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} .for _T in dynstr_test \ env_test \ fs_test \ list_test \ map_test \ process_test \ sanity_test \ text_test \ user_test ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor .for p in process_helpers version_helper PROGS+= ${p} SRCS.${p}= ${p}.c MAN.${p}= # defined BINDIR.${p}= ${TESTSDIR} .endfor version_helper.o: atf-version .include "../../../common.mk" .include Index: head/lib/atf/libatf-c++/tests/Makefile =================================================================== --- head/lib/atf/libatf-c++/tests/Makefile (revision 299093) +++ head/lib/atf/libatf-c++/tests/Makefile (revision 299094) @@ -1,33 +1,30 @@ # $FreeBSD$ .include -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} +PACKAGE= tests TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c++ .PATH: ${ATF}/atf-c++/detail CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} -FILESDIR= ${TESTSDIR} -FILES= macros_hpp_test.cpp -FILES+= unused_test.cpp +${PACKAGE}FILES+= macros_hpp_test.cpp +${PACKAGE}FILES+= unused_test.cpp .for _T in atf_c++_test \ build_test \ check_test \ macros_test \ tests_test \ utils_test ATF_TESTS_CXX+= ${_T} SRCS.${_T}= ${_T}.cpp test_helpers.cpp .endfor .include Index: head/lib/atf/libatf-c++/tests/detail/Makefile =================================================================== --- head/lib/atf/libatf-c++/tests/detail/Makefile (revision 299093) +++ head/lib/atf/libatf-c++/tests/detail/Makefile (revision 299094) @@ -1,36 +1,33 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c++/detail CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} .for _T in application_test \ env_test \ exceptions_test \ fs_test \ process_test \ text_test ATF_TESTS_CXX+= ${_T} SRCS.${_T}= ${_T}.cpp test_helpers.cpp .endfor .for p in version_helper PROGS_CXX+= ${p} SRCS.${p}= ${p}.cpp MAN.${p}= # defined BINDIR.${p}= ${TESTSDIR} .endfor version_helper.o: atf-version .include "../../../common.mk" .include Index: head/lib/atf/tests/Makefile =================================================================== --- head/lib/atf/tests/Makefile (revision 299093) +++ head/lib/atf/tests/Makefile (revision 299094) @@ -1,18 +1,8 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/lib/atf -TESTS+= Kyuafile - - .PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs .include Index: head/lib/atf/tests/test-programs/Makefile =================================================================== --- head/lib/atf/tests/test-programs/Makefile (revision 299093) +++ head/lib/atf/tests/test-programs/Makefile (revision 299094) @@ -1,29 +1,25 @@ # $FreeBSD$ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs -TESTS+= Kyuafile + KYUAFILE= yes ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/test-programs CFLAGS+= -I${ATF} ATF_TESTS_C= c_helpers ATF_TESTS_CXX= cpp_helpers SRCS.cpp_helpers= cpp_helpers.cpp ATF_TESTS_SH= sh_helpers .for _T in config_test expect_test meta_data_test result_test srcdir_test ATF_TESTS_SH+= ${_T} ATF_TESTS_SH_SRC_${_T}= common.sh ${_T}.sh .endfor .include Index: head/lib/libarchive/tests/Makefile =================================================================== --- head/lib/libarchive/tests/Makefile (revision 299093) +++ head/lib/libarchive/tests/Makefile (revision 299094) @@ -1,457 +1,455 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} PROGS+= libarchive_test CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/test_utils CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC .PATH: ${_LIBARCHIVEDIR}/libarchive/test TESTS_SRCS= \ test_acl_freebsd_nfs4.c \ test_acl_freebsd_posix1e.c \ test_acl_nfs4.c \ test_acl_pax.c \ test_acl_posix1e.c \ test_archive_api_feature.c \ test_archive_clear_error.c \ test_archive_cmdline.c \ test_archive_crypto.c \ test_archive_getdate.c \ test_archive_match_time.c \ test_archive_match_owner.c \ test_archive_match_path.c \ test_archive_pathmatch.c \ test_archive_read_close_twice.c \ test_archive_read_close_twice_open_fd.c \ test_archive_read_close_twice_open_filename.c \ test_archive_read_multiple_data_objects.c \ test_archive_read_next_header_empty.c \ test_archive_read_next_header_raw.c \ test_archive_read_open2.c \ test_archive_read_set_filter_option.c \ test_archive_read_set_format_option.c \ test_archive_read_set_option.c \ test_archive_read_set_options.c \ test_archive_read_support.c \ test_archive_set_error.c \ test_archive_string.c \ test_archive_string_conversion.c \ test_archive_write_add_filter_by_name.c \ test_archive_write_set_filter_option.c \ test_archive_write_set_format_by_name.c \ test_archive_write_set_format_option.c \ test_archive_write_set_option.c \ test_archive_write_set_options.c \ test_bad_fd.c \ test_compat_bzip2.c \ test_compat_cpio.c \ test_compat_gtar.c \ test_compat_gzip.c \ test_compat_lzip.c \ test_compat_lzma.c \ test_compat_lzop.c \ test_compat_mac.c \ test_compat_pax_libarchive_2x.c \ test_compat_solaris_tar_acl.c \ test_compat_solaris_pax_sparse.c \ test_compat_tar_hardlink.c \ test_compat_uudecode.c \ test_compat_xz.c \ test_compat_zip.c \ test_empty_write.c \ test_entry.c \ test_entry_strmode.c \ test_extattr_freebsd.c \ test_filter_count.c \ test_fuzz.c \ test_gnutar_filename_encoding.c \ test_link_resolver.c \ test_open_fd.c \ test_open_failure.c \ test_open_file.c \ test_open_filename.c \ test_pax_filename_encoding.c \ test_read_data_large.c \ test_read_disk.c \ test_read_disk_directory_traversals.c \ test_read_disk_entry_from_file.c \ test_read_extract.c \ test_read_file_nonexistent.c \ test_read_filter_grzip.c \ test_read_filter_lrzip.c \ test_read_filter_lzop.c \ test_read_filter_lzop_multiple_parts.c \ test_read_filter_program.c \ test_read_filter_program_signature.c \ test_read_filter_uudecode.c \ test_read_format_7zip.c \ test_read_format_ar.c \ test_read_format_cab.c \ test_read_format_cab_filename.c \ test_read_format_cpio_afio.c \ test_read_format_cpio_bin.c \ test_read_format_cpio_bin_Z.c \ test_read_format_cpio_bin_be.c \ test_read_format_cpio_bin_bz2.c \ test_read_format_cpio_bin_gz.c \ test_read_format_cpio_bin_lzip.c \ test_read_format_cpio_bin_lzma.c \ test_read_format_cpio_bin_xz.c \ test_read_format_cpio_filename.c \ test_read_format_cpio_odc.c \ test_read_format_cpio_svr4_gzip.c \ test_read_format_cpio_svr4c_Z.c \ test_read_format_cpio_svr4_bzip2_rpm.c \ test_read_format_cpio_svr4_gzip_rpm.c \ test_read_format_empty.c \ test_read_format_gtar_filename.c \ test_read_format_gtar_gz.c \ test_read_format_gtar_lzma.c \ test_read_format_gtar_sparse.c \ test_read_format_gtar_sparse_skip_entry.c \ test_read_format_iso_Z.c \ test_read_format_iso_multi_extent.c \ test_read_format_iso_xorriso.c \ test_read_format_isorr_rr_moved.c \ test_read_format_isojoliet_bz2.c \ test_read_format_isojoliet_long.c \ test_read_format_isojoliet_rr.c \ test_read_format_isojoliet_versioned.c \ test_read_format_isorr_bz2.c \ test_read_format_isorr_ce.c \ test_read_format_isorr_new_bz2.c \ test_read_format_isozisofs_bz2.c \ test_read_format_lha.c \ test_read_format_lha_filename.c \ test_read_format_mtree.c \ test_read_format_pax_bz2.c \ test_read_format_rar.c \ test_read_format_raw.c \ test_read_format_tar.c \ test_read_format_tar_empty_filename.c \ test_read_format_tar_filename.c \ test_read_format_tbz.c \ test_read_format_tgz.c \ test_read_format_tlz.c \ test_read_format_txz.c \ test_read_format_tz.c \ test_read_format_ustar_filename.c \ test_read_format_xar.c \ test_read_format_zip.c \ test_read_format_zip_comment_stored.c \ test_read_format_zip_filename.c \ test_read_format_zip_mac_metadata.c \ test_read_format_zip_sfx.c \ test_read_large.c \ test_read_pax_truncated.c \ test_read_position.c \ test_read_set_format.c \ test_read_truncated.c \ test_read_truncated_filter.c \ test_sparse_basic.c \ test_tar_filenames.c \ test_tar_large.c \ test_ustar_filenames.c \ test_ustar_filename_encoding.c \ test_write_disk.c \ test_write_disk_appledouble.c \ test_write_disk_failures.c \ test_write_disk_hardlink.c \ test_write_disk_hfs_compression.c \ test_write_disk_lookup.c \ test_write_disk_mac_metadata.c \ test_write_disk_no_hfs_compression.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ test_write_disk_sparse.c \ test_write_disk_symlink.c \ test_write_disk_times.c \ test_write_filter_b64encode.c \ test_write_filter_bzip2.c \ test_write_filter_compress.c \ test_write_filter_gzip.c \ test_write_filter_gzip_timestamp.c \ test_write_filter_lrzip.c \ test_write_filter_lzip.c \ test_write_filter_lzma.c \ test_write_filter_lzop.c \ test_write_filter_program.c \ test_write_filter_uuencode.c \ test_write_filter_xz.c \ test_write_format_7zip.c \ test_write_format_7zip_empty.c \ test_write_format_7zip_large.c \ test_write_format_ar.c \ test_write_format_cpio.c \ test_write_format_cpio_empty.c \ test_write_format_cpio_newc.c \ test_write_format_cpio_odc.c \ test_write_format_gnutar.c \ test_write_format_iso9660.c \ test_write_format_iso9660_boot.c \ test_write_format_iso9660_empty.c \ test_write_format_iso9660_filename.c \ test_write_format_iso9660_zisofs.c \ test_write_format_mtree.c \ test_write_format_mtree_absolute_path.c \ test_write_format_mtree_classic.c \ test_write_format_mtree_classic_indent.c \ test_write_format_mtree_fflags.c \ test_write_format_mtree_no_separator.c \ test_write_format_mtree_quoted_filename.c \ test_write_format_pax.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ test_write_format_tar_empty.c \ test_write_format_tar_sparse.c \ test_write_format_tar_ustar.c \ test_write_format_tar_v7tar.c \ test_write_format_xar.c \ test_write_format_xar_empty.c \ test_write_format_zip.c \ test_write_format_zip_empty.c \ test_write_format_zip_no_compression.c \ test_write_zip_set_compression_store.c \ test_write_open_memory.c \ test_zip_filename_encoding.c # Deterministic failures: # Crashes with SIGBUS BROKEN_TESTS+= test_archive_rmd160 # Fails with `libarchive/test/test_archive_crypto.c:121: md != actualmd` BROKEN_TESTS+= test_archive_sha384 # Fails with `test_compat_pax_libarchive_2x.c:122: ARCHIVE_WARN != archive_read_next_header(a, &ae)` BROKEN_TESTS+= test_compat_pax_libarchive_2x # Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago` BROKEN_TESTS+= test_read_disk_directory_traversals # Non-deterministic failures: # (Times out?) [and] crashes BROKEN_TESTS+= test_fuzz_rar # Build the test program. SRCS.libarchive_test= \ ${TESTS_SRCS} \ main.c \ read_open_memory.c \ list.h LIBADD.libarchive_test= archive .PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.libarchive_test+= test_utils.c # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines list.h: ${TESTS_SRCS} Makefile @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \ egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} -CLEANFILES+= list.h list.h.tmp +CLEANTESTS+= list.h list.h.tmp -FILES+= README -FILES+= test_acl_pax.tar.uu -FILES+= test_archive_string_conversion.txt.Z.uu -FILES+= test_compat_bzip2_1.tbz.uu -FILES+= test_compat_bzip2_2.tbz.uu -FILES+= test_compat_cpio_1.cpio.uu -FILES+= test_compat_gtar_1.tar.uu -FILES+= test_compat_gzip_1.tgz.uu -FILES+= test_compat_gzip_2.tgz.uu -FILES+= test_compat_lzip_1.tlz.uu -FILES+= test_compat_lzip_2.tlz.uu -FILES+= test_compat_lzma_1.tlz.uu -FILES+= test_compat_lzma_2.tlz.uu -FILES+= test_compat_lzma_3.tlz.uu -FILES+= test_compat_lzop_1.tar.lzo.uu -FILES+= test_compat_lzop_2.tar.lzo.uu -FILES+= test_compat_lzop_3.tar.lzo.uu -FILES+= test_compat_mac-1.tar.Z.uu -FILES+= test_compat_mac-2.tar.Z.uu -FILES+= test_compat_pax_libarchive_2x.tar.Z.uu -FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu -FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu -FILES+= test_compat_solaris_tar_acl.tar.uu -FILES+= test_compat_tar_hardlink_1.tar.uu -FILES+= test_compat_xz_1.txz.uu -FILES+= test_compat_zip_1.zip.uu -FILES+= test_compat_zip_2.zip.uu -FILES+= test_compat_zip_3.zip.uu -FILES+= test_compat_zip_4.zip.uu -FILES+= test_compat_zip_5.zip.uu -FILES+= test_compat_zip_6.zip.uu -FILES+= test_compat_zip_7.xps.uu -FILES+= test_fuzz.cab.uu -FILES+= test_fuzz.lzh.uu -FILES+= test_fuzz_1.iso.Z.uu -FILES+= test_pax_filename_encoding.tar.uu -FILES+= test_rar_multivolume_multiple_files.part1.rar.uu -FILES+= test_rar_multivolume_multiple_files.part2.rar.uu -FILES+= test_rar_multivolume_multiple_files.part3.rar.uu -FILES+= test_rar_multivolume_multiple_files.part4.rar.uu -FILES+= test_rar_multivolume_multiple_files.part5.rar.uu -FILES+= test_rar_multivolume_multiple_files.part6.rar.uu -FILES+= test_rar_multivolume_single_file.part1.rar.uu -FILES+= test_rar_multivolume_single_file.part2.rar.uu -FILES+= test_rar_multivolume_single_file.part3.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu -FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu -FILES+= test_read_filter_grzip.tar.grz.uu -FILES+= test_read_filter_lrzip.tar.lrz.uu -FILES+= test_read_filter_lzop.tar.lzo.uu -FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu -FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu -FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu -FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu -FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu -FILES+= test_read_format_7zip_bcj2_deflate.7z.uu -FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu -FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu -FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu -FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu -FILES+= test_read_format_7zip_bcj_bzip2.7z.uu -FILES+= test_read_format_7zip_bcj_copy.7z.uu -FILES+= test_read_format_7zip_bcj_deflate.7z.uu -FILES+= test_read_format_7zip_bcj_lzma1.7z.uu -FILES+= test_read_format_7zip_bcj_lzma2.7z.uu -FILES+= test_read_format_7zip_bzip2.7z.uu -FILES+= test_read_format_7zip_copy.7z.uu -FILES+= test_read_format_7zip_copy_2.7z.uu -FILES+= test_read_format_7zip_deflate.7z.uu -FILES+= test_read_format_7zip_delta_lzma1.7z.uu -FILES+= test_read_format_7zip_delta_lzma2.7z.uu -FILES+= test_read_format_7zip_empty_archive.7z.uu -FILES+= test_read_format_7zip_empty_file.7z.uu -FILES+= test_read_format_7zip_lzma1.7z.uu -FILES+= test_read_format_7zip_lzma1_2.7z.uu -FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu -FILES+= test_read_format_7zip_lzma2.7z.uu -FILES+= test_read_format_7zip_ppmd.7z.uu -FILES+= test_read_format_7zip_symbolic_name.7z.uu -FILES+= test_read_format_ar.ar.uu -FILES+= test_read_format_cab_1.cab.uu -FILES+= test_read_format_cab_2.cab.uu -FILES+= test_read_format_cab_3.cab.uu -FILES+= test_read_format_cab_filename_cp932.cab.uu -FILES+= test_read_format_cpio_bin_be.cpio.uu -FILES+= test_read_format_cpio_filename_cp866.cpio.uu -FILES+= test_read_format_cpio_filename_eucjp.cpio.uu -FILES+= test_read_format_cpio_filename_koi8r.cpio.uu -FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu -FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu -FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu -FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu -FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu -FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu -FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu -FILES+= test_read_format_gtar_sparse_1_13.tar.uu -FILES+= test_read_format_gtar_sparse_1_17.tar.uu -FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu -FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu -FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu -FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu -FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu -FILES+= test_read_format_iso.iso.Z.uu -FILES+= test_read_format_iso_2.iso.Z.uu -FILES+= test_read_format_iso_joliet.iso.Z.uu -FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu -FILES+= test_read_format_iso_joliet_long.iso.Z.uu -FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu -FILES+= test_read_format_iso_multi_extent.iso.Z.uu -FILES+= test_read_format_iso_rockridge.iso.Z.uu -FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu -FILES+= test_read_format_iso_rockridge_new.iso.Z.uu -FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu -FILES+= test_read_format_iso_xorriso.iso.Z.uu -FILES+= test_read_format_iso_zisofs.iso.Z.uu -FILES+= test_read_format_lha_filename_cp932.lzh.uu -FILES+= test_read_format_lha_header0.lzh.uu -FILES+= test_read_format_lha_header1.lzh.uu -FILES+= test_read_format_lha_header2.lzh.uu -FILES+= test_read_format_lha_header3.lzh.uu -FILES+= test_read_format_lha_lh0.lzh.uu -FILES+= test_read_format_lha_lh6.lzh.uu -FILES+= test_read_format_lha_lh7.lzh.uu -FILES+= test_read_format_lha_withjunk.lzh.uu -FILES+= test_read_format_mtree.mtree.uu -FILES+= test_read_format_mtree_nomagic.mtree.uu -FILES+= test_read_format_mtree_nomagic2.mtree.uu -FILES+= test_read_format_mtree_nomagic3.mtree.uu -FILES+= test_read_format_rar.rar.uu -FILES+= test_read_format_rar_binary_data.rar.uu -FILES+= test_read_format_rar_compress_best.rar.uu -FILES+= test_read_format_rar_compress_normal.rar.uu -FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu -FILES+= test_read_format_rar_multivolume.part0001.rar.uu -FILES+= test_read_format_rar_multivolume.part0002.rar.uu -FILES+= test_read_format_rar_multivolume.part0003.rar.uu -FILES+= test_read_format_rar_multivolume.part0004.rar.uu -FILES+= test_read_format_rar_noeof.rar.uu -FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu -FILES+= test_read_format_rar_sfx.exe.uu -FILES+= test_read_format_rar_subblock.rar.uu -FILES+= test_read_format_rar_unicode.rar.uu -FILES+= test_read_format_rar_windows.rar.uu -FILES+= test_read_format_raw.data.Z.uu -FILES+= test_read_format_raw.data.uu -FILES+= test_read_format_tar_empty_filename.tar.uu -FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu -FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu -FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu -FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu -FILES+= test_read_format_zip.zip.uu -FILES+= test_read_format_zip_comment_stored_1.zip.uu -FILES+= test_read_format_zip_comment_stored_2.zip.uu -FILES+= test_read_format_zip_filename_cp866.zip.uu -FILES+= test_read_format_zip_filename_cp932.zip.uu -FILES+= test_read_format_zip_filename_koi8r.zip.uu -FILES+= test_read_format_zip_filename_utf8_jp.zip.uu -FILES+= test_read_format_zip_filename_utf8_ru.zip.uu -FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu -FILES+= test_read_format_zip_length_at_end.zip.uu -FILES+= test_read_format_zip_mac_metadata.zip.uu -FILES+= test_read_format_zip_sfx.uu -FILES+= test_read_format_zip_symlink.zip.uu -FILES+= test_read_format_zip_ux.zip.uu -FILES+= test_read_large_splitted_rar_aa.uu -FILES+= test_read_large_splitted_rar_ab.uu -FILES+= test_read_large_splitted_rar_ac.uu -FILES+= test_read_large_splitted_rar_ad.uu -FILES+= test_read_large_splitted_rar_ae.uu -FILES+= test_read_splitted_rar_aa.uu -FILES+= test_read_splitted_rar_ab.uu -FILES+= test_read_splitted_rar_ac.uu -FILES+= test_read_splitted_rar_ad.uu -FILES+= test_splitted_rar_seek_support_aa.uu -FILES+= test_splitted_rar_seek_support_ab.uu -FILES+= test_splitted_rar_seek_support_ac.uu -FILES+= test_write_disk_appledouble.cpio.gz.uu -FILES+= test_write_disk_hfs_compression.tgz.uu -FILES+= test_write_disk_mac_metadata.tar.gz.uu -FILES+= test_write_disk_no_hfs_compression.tgz.uu +${PACKAGE}FILES+= README +${PACKAGE}FILES+= test_acl_pax.tar.uu +${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu +${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu +${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu +${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu +${PACKAGE}FILES+= test_compat_gtar_1.tar.uu +${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu +${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu +${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu +${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu +${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu +${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu +${PACKAGE}FILES+= test_compat_pax_libarchive_2x.tar.Z.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu +${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu +${PACKAGE}FILES+= test_compat_xz_1.txz.uu +${PACKAGE}FILES+= test_compat_zip_1.zip.uu +${PACKAGE}FILES+= test_compat_zip_2.zip.uu +${PACKAGE}FILES+= test_compat_zip_3.zip.uu +${PACKAGE}FILES+= test_compat_zip_4.zip.uu +${PACKAGE}FILES+= test_compat_zip_5.zip.uu +${PACKAGE}FILES+= test_compat_zip_6.zip.uu +${PACKAGE}FILES+= test_compat_zip_7.xps.uu +${PACKAGE}FILES+= test_fuzz.cab.uu +${PACKAGE}FILES+= test_fuzz.lzh.uu +${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu +${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu +${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu +${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu +${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu +${PACKAGE}FILES+= test_read_format_ar.ar.uu +${PACKAGE}FILES+= test_read_format_cab_1.cab.uu +${PACKAGE}FILES+= test_read_format_cab_2.cab.uu +${PACKAGE}FILES+= test_read_format_cab_3.cab.uu +${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu +${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu +${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu +${PACKAGE}FILES+= test_read_format_mtree.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu +${PACKAGE}FILES+= test_read_format_rar.rar.uu +${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu +${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu +${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu +${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu +${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu +${PACKAGE}FILES+= test_read_format_raw.data.Z.uu +${PACKAGE}FILES+= test_read_format_raw.data.uu +${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu +${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_zip.zip.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu +${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu +${PACKAGE}FILES+= test_read_format_zip_sfx.uu +${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu +${PACKAGE}FILES+= test_read_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_splitted_rar_ad.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu +${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu +${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu +${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu +${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu .include Index: head/lib/libc/tests/Makefile =================================================================== --- head/lib/libc/tests/Makefile (revision 299093) +++ head/lib/libc/tests/Makefile (revision 299094) @@ -1,40 +1,36 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - SUBDIR= tls_dso TESTS_SUBDIRS= c063 TESTS_SUBDIRS+= db TESTS_SUBDIRS+= gen TESTS_SUBDIRS+= hash TESTS_SUBDIRS+= inet TESTS_SUBDIRS+= net TESTS_SUBDIRS+= nss TESTS_SUBDIRS+= regex TESTS_SUBDIRS+= resolv TESTS_SUBDIRS+= rpc TESTS_SUBDIRS+= setjmp TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib TESTS_SUBDIRS+= string TESTS_SUBDIRS+= sys TESTS_SUBDIRS+= termios TESTS_SUBDIRS+= tls TESTS_SUBDIRS+= ttyio SUBDIR_DEPEND_tls= tls_dso .if ${MK_LOCALES} != "no" TESTS_SUBDIRS+= locale .endif .if ${MK_SSP} != "no" TESTS_SUBDIRS+= ssp .endif .include Index: head/lib/libc/tests/c063/Makefile =================================================================== --- head/lib/libc/tests/c063/Makefile (revision 299093) +++ head/lib/libc/tests/c063/Makefile (revision 299094) @@ -1,29 +1,25 @@ # $FreeBSD$ #TODO: t_o_search -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= faccessat_test NETBSD_ATF_TESTS_C+= fchmodat_test NETBSD_ATF_TESTS_C+= fchownat_test NETBSD_ATF_TESTS_C+= fexecve_test NETBSD_ATF_TESTS_C+= fstatat_test NETBSD_ATF_TESTS_C+= linkat_test NETBSD_ATF_TESTS_C+= mkdirat_test NETBSD_ATF_TESTS_C+= mkfifoat_test NETBSD_ATF_TESTS_C+= mknodat_test NETBSD_ATF_TESTS_C+= openat_test NETBSD_ATF_TESTS_C+= readlinkat_test NETBSD_ATF_TESTS_C+= renameat_test NETBSD_ATF_TESTS_C+= symlinkat_test NETBSD_ATF_TESTS_C+= unlinkat_test NETBSD_ATF_TESTS_C+= utimensat_test CFLAGS+= -D_INCOMPLETE_XOPEN_C063 .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/db/Makefile =================================================================== --- head/lib/libc/tests/db/Makefile (revision 299093) +++ head/lib/libc/tests/db/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} BINDIR= ${TESTSDIR} PROGS= h_db -FILESDIR= ${TESTSDIR} - -FILES= README +${PACKAGE}FILES+= README NETBSD_ATF_TESTS_SH+= db_test ATF_TESTS_SH_SED_db_test= -e 's,/bin/csh,/bin/cat,g' .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/gen/Makefile =================================================================== --- head/lib/libc/tests/gen/Makefile (revision 299093) +++ head/lib/libc/tests/gen/Makefile (revision 299094) @@ -1,83 +1,79 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= arc4random_test ATF_TESTS_C+= fmtcheck2_test ATF_TESTS_C+= fmtmsg_test ATF_TESTS_C+= fnmatch2_test ATF_TESTS_C+= fpclassify2_test ATF_TESTS_C+= ftw_test ATF_TESTS_C+= popen_test ATF_TESTS_C+= posix_spawn_test ATF_TESTS_C+= wordexp_test ATF_TESTS_C+= dlopen_empty_test # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep # TODO: t_siginfo (fixes require further inspection) # TODO: t_sethostname_test (consistently screws up the hostname) NETBSD_ATF_TESTS_C= alarm_test NETBSD_ATF_TESTS_C+= assert_test NETBSD_ATF_TESTS_C+= basedirname_test NETBSD_ATF_TESTS_C+= dir_test NETBSD_ATF_TESTS_C+= floatunditf_test NETBSD_ATF_TESTS_C+= fnmatch_test NETBSD_ATF_TESTS_C+= fpclassify_test NETBSD_ATF_TESTS_C+= fpsetmask_test NETBSD_ATF_TESTS_C+= fpsetround_test NETBSD_ATF_TESTS_C+= ftok_test NETBSD_ATF_TESTS_C+= getcwd_test NETBSD_ATF_TESTS_C+= getgrent_test NETBSD_ATF_TESTS_C+= glob_test NETBSD_ATF_TESTS_C+= humanize_number_test NETBSD_ATF_TESTS_C+= isnan_test NETBSD_ATF_TESTS_C+= nice_test NETBSD_ATF_TESTS_C+= pause_test NETBSD_ATF_TESTS_C+= raise_test NETBSD_ATF_TESTS_C+= realpath_test NETBSD_ATF_TESTS_C+= setdomainname_test NETBSD_ATF_TESTS_C+= sethostname_test NETBSD_ATF_TESTS_C+= sleep_test NETBSD_ATF_TESTS_C+= syslog_test NETBSD_ATF_TESTS_C+= time_test NETBSD_ATF_TESTS_C+= ttyname_test NETBSD_ATF_TESTS_C+= vis_test .include "../Makefile.netbsd-tests" LIBADD.humanize_number_test+= util LIBADD.fpclassify_test+=m LIBADD.fpsetround_test+=m LIBADD.siginfo_test+= m LIBADD.nice_test+= pthread LIBADD.syslog_test+= pthread CFLAGS+= -I${.CURDIR} SRCS.fmtcheck2_test= fmtcheck_test.c SRCS.fnmatch2_test= fnmatch_test.c TESTS_SUBDIRS= execve TESTS_SUBDIRS+= posix_spawn # The old testcase name TEST_FNMATCH= test-fnmatch CLEANFILES+= ${GEN_SH_CASE_TESTCASES} sh-tests: .PHONY .for target in clean obj depend all @cd ${.CURDIR} && ${MAKE} PROG=${TEST_FNMATCH} \ -DNO_SUBDIR ${target} .endfor @cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 1 > \ ${SRCTOP}/bin/sh/tests/builtins/case2.0 @cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 2 > \ ${SRCTOP}/bin/sh/tests/builtins/case3.0 .include Index: head/lib/libc/tests/gen/execve/Makefile =================================================================== --- head/lib/libc/tests/gen/execve/Makefile (revision 299093) +++ head/lib/libc/tests/gen/execve/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= execve_test .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/gen/posix_spawn/Makefile =================================================================== --- head/lib/libc/tests/gen/posix_spawn/Makefile (revision 299093) +++ head/lib/libc/tests/gen/posix_spawn/Makefile (revision 299094) @@ -1,34 +1,30 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - BINDIR= ${TESTSDIR} NETBSD_ATF_TESTS_C= fileactions_test NETBSD_ATF_TESTS_C+= spawn_test NETBSD_ATF_TESTS_C+= spawnattr_test PROGS= h_fileactions PROGS+= h_spawn PROGS+= h_spawnattr SCRIPTS= h_nonexec SCRIPTS+= h_zero CLEANFILES+= h_nonexec .include "../../Makefile.netbsd-tests" h_zero: dd if=/dev/zero of=h_zero bs=1k count=2 status=none chmod a+x h_zero CLEANFILES+= h_zero WARNS?=3 .include Index: head/lib/libc/tests/hash/Makefile =================================================================== --- head/lib/libc/tests/hash/Makefile (revision 299093) +++ head/lib/libc/tests/hash/Makefile (revision 299094) @@ -1,37 +1,38 @@ # $FreeBSD$ -.include - PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} +.include + NETBSD_ATF_TESTS_C= .if ${MK_OPENSSL} != "no" NETBSD_ATF_TESTS_C+= sha2_test .endif NETBSD_ATF_TESTS_SH= hash_test BINDIR= ${TESTSDIR} PROGS+= h_hash -FILESDIR= ${TESTSDIR}/data +FILESGROUPS+= ${PACKAGE}DATA_FILES +${PACKAGE}DATA_FILESPACKAGE= tests -FILES+= data/md5test-in -FILES+= data/md5test-out -FILES+= data/sha1test-in -FILES+= data/sha1test-out -FILES+= data/sha1test2-out +${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data + +${PACKAGE}DATA_FILES+= data/md5test-in +${PACKAGE}DATA_FILES+= data/md5test-out +${PACKAGE}DATA_FILES+= data/sha1test-in +${PACKAGE}DATA_FILES+= data/sha1test-out +${PACKAGE}DATA_FILES+= data/sha1test2-out LIBADD+= md LIBADD.sha2_test+= crypto CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh/openbsd-compat CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/inet/Makefile =================================================================== --- head/lib/libc/tests/inet/Makefile (revision 299093) +++ head/lib/libc/tests/inet/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= inet_network_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/locale/Makefile =================================================================== --- head/lib/libc/tests/locale/Makefile (revision 299093) +++ head/lib/libc/tests/locale/Makefile (revision 299094) @@ -1,48 +1,44 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= btowc_test ATF_TESTS_C+= c16rtomb_test ATF_TESTS_C+= iswctype_test ATF_TESTS_C+= mblen_test ATF_TESTS_C+= mbrlen_test ATF_TESTS_C+= mbrtoc16_test ATF_TESTS_C+= mbrtowc_2_test ATF_TESTS_C+= mbsnrtowcs_2_test ATF_TESTS_C+= mbsrtowcs_test ATF_TESTS_C+= mbstowcs_2_test ATF_TESTS_C+= mbtowc_2_test ATF_TESTS_C+= towctrans_test ATF_TESTS_C+= wcrtomb_test ATF_TESTS_C+= wcsnrtombs_test ATF_TESTS_C+= wcsrtombs_test ATF_TESTS_C+= wcstombs_test ATF_TESTS_C+= wctomb_2_test NETBSD_ATF_TESTS_C= io_test NETBSD_ATF_TESTS_C+= mbrtowc_test NETBSD_ATF_TESTS_C+= mbstowcs_test NETBSD_ATF_TESTS_C+= mbsnrtowcs_test NETBSD_ATF_TESTS_C+= mbtowc_test NETBSD_ATF_TESTS_C+= wcscspn_test NETBSD_ATF_TESTS_C+= wcspbrk_test NETBSD_ATF_TESTS_C+= wcsspn_test NETBSD_ATF_TESTS_C+= wcstod_test NETBSD_ATF_TESTS_C+= wctomb_test SRCS.mbrtowc_2_test= mbrtowc_test.c SRCS.mbsnrtowcs_2_test= mbsnrtowcs_test.c SRCS.mbstowcs_2_test= mbstowcs_test.c SRCS.mbtowc_2_test= mbtowc_test.c SRCS.wctomb_2_test= wctomb_test.c CFLAGS.t_wctomb.c+= -Wno-stack-protector .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/net/Makefile =================================================================== --- head/lib/libc/tests/net/Makefile (revision 299093) +++ head/lib/libc/tests/net/Makefile (revision 299094) @@ -1,43 +1,41 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_C+= ether_test ATF_TESTS_C+= eui64_aton_test ATF_TESTS_C+= eui64_ntoa_test CFLAGS+= -I${.CURDIR} NETBSD_ATF_TESTS_C+= getprotoent_test NETBSD_ATF_TESTS_C+= ether_aton_test SRCS.ether_aton_test= aton_ether_subr.c t_ether_aton.c # TODO: hostent_test NETBSD_ATF_TESTS_SH= nsdispatch_test NETBSD_ATF_TESTS_SH+= protoent_test NETBSD_ATF_TESTS_SH+= servent_test BINDIR= ${TESTSDIR} PROGS= h_nsd_recurse PROGS+= h_protoent PROGS+= h_servent PROGS+= h_dns_server LIBADD.h_nsd_recurse+= pthread CLEANFILES+= aton_ether_subr.c aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c ${__MAKE_SHELL} ${.ALLSRC} ${.TARGET} .include "../Makefile.netbsd-tests" # TODO: the testcases needs to be ported to FreeBSD #TESTS_SUBDIRS= getaddrinfo -FILES+= hosts -FILES+= resolv.conf +${PACKAGE}FILES+= hosts +${PACKAGE}FILES+= resolv.conf .include Index: head/lib/libc/tests/net/getaddrinfo/Makefile =================================================================== --- head/lib/libc/tests/net/getaddrinfo/Makefile (revision 299093) +++ head/lib/libc/tests/net/getaddrinfo/Makefile (revision 299094) @@ -1,27 +1,32 @@ # $FreeBSD$ +PACKAGE= tests + TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T} .include BINDIR= ${TESTSDIR} .error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)" NETBSD_ATF_TESTS_SH= getaddrinfo_test PROGS= h_gai -FILESDIR= ${TESTSDIR}/data +FILESGROUPS+= ${PACKAGE}DATA_FILES +${PACKAGE}DATA_FILESPACKAGE= tests -FILES= basics_v4.exp basics_v4v6.exp -FILES+= no_host_v4.exp no_host_v4v6.exp -FILES+= no_serv_v4.exp no_serv_v4v6.exp -FILES+= sock_raw_v4.exp sock_raw_v4v6.exp -FILES+= spec_fam_v4.exp spec_fam_v4v6.exp -FILES+= scoped.exp -FILES+= unsup_fam.exp +${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data + +${PACKAGE}DATA_FILES+= basics_v4.exp basics_v4v6.exp +${PACKAGE}DATA_FILES+= no_host_v4.exp no_host_v4v6.exp +${PACKAGE}DATA_FILES+= no_serv_v4.exp no_serv_v4v6.exp +${PACKAGE}DATA_FILES+= sock_raw_v4.exp sock_raw_v4v6.exp +${PACKAGE}DATA_FILES+= spec_fam_v4.exp spec_fam_v4v6.exp +${PACKAGE}DATA_FILES+= scoped.exp +${PACKAGE}DATA_FILES+= unsup_fam.exp .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/nss/Makefile =================================================================== --- head/lib/libc/tests/nss/Makefile (revision 299093) +++ head/lib/libc/tests/nss/Makefile (revision 299094) @@ -1,26 +1,25 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/lib/libc/nss BINDIR= ${TESTSDIR} .PATH: ${.CURDIR:H}/resolv -FILES+= mach +${PACKAGE}FILES+= mach CFLAGS+= -I${SRCTOP}/tests ATF_TESTS_C+= getaddrinfo_test ATF_TESTS_C+= getgr_test ATF_TESTS_C+= gethostby_test TEST_METADATA.gethostby_test= timeout="1200" ATF_TESTS_C+= getpw_test ATF_TESTS_C+= getproto_test ATF_TESTS_C+= getrpc_test ATF_TESTS_C+= getserv_test ATF_TESTS_C+= getusershell_test .include Index: head/lib/libc/tests/regex/Makefile =================================================================== --- head/lib/libc/tests/regex/Makefile (revision 299093) +++ head/lib/libc/tests/regex/Makefile (revision 299094) @@ -1,60 +1,62 @@ # $FreeBSD$ .include PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} BINDIR= ${TESTSDIR} IMPLEMENTATION?= -DREGEX_SPENCER CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex PROGS+= h_regex SRCS.h_regex= main.c split.c debug.c NETBSD_ATF_TESTS_SH= regex_test -FILESDIR= ${TESTSDIR}/data -FILES+= README -FILES+= data/anchor.in -FILES+= data/backref.in -FILES+= data/basic.in -FILES+= data/bracket.in -FILES+= data/c_comments.in -FILES+= data/complex.in -FILES+= data/error.in -FILES+= data/meta.in -FILES+= data/nospec.in -FILES+= data/paren.in -FILES+= data/regress.in -FILES+= data/repet_bounded.in -FILES+= data/repet_multi.in -FILES+= data/repet_ordinary.in -FILES+= data/startend.in -FILES+= data/subexp.in -FILES+= data/subtle.in -FILES+= data/word_bound.in -FILES+= data/zero.in -#FILES+= data/att/README -FILES+= data/att/basic.dat -FILES+= data/att/categorization.dat -FILES+= data/att/forcedassoc.dat -FILES+= data/att/leftassoc.dat -FILES+= data/att/nullsubexpr.dat -FILES+= data/att/repetition.dat -FILES+= data/att/rightassoc.dat +${PACKAGE}FILES+= README + +FILESGROUPS+= ${PACKAGE}DATA_FILES +${PACKAGE}DATA_FILESPACKAGE=${PACKAGE} + +${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data +${PACKAGE}DATA_FILES+= data/anchor.in +${PACKAGE}DATA_FILES+= data/backref.in +${PACKAGE}DATA_FILES+= data/basic.in +${PACKAGE}DATA_FILES+= data/bracket.in +${PACKAGE}DATA_FILES+= data/c_comments.in +${PACKAGE}DATA_FILES+= data/complex.in +${PACKAGE}DATA_FILES+= data/error.in +${PACKAGE}DATA_FILES+= data/meta.in +${PACKAGE}DATA_FILES+= data/nospec.in +${PACKAGE}DATA_FILES+= data/paren.in +${PACKAGE}DATA_FILES+= data/regress.in +${PACKAGE}DATA_FILES+= data/repet_bounded.in +${PACKAGE}DATA_FILES+= data/repet_multi.in +${PACKAGE}DATA_FILES+= data/repet_ordinary.in +${PACKAGE}DATA_FILES+= data/startend.in +${PACKAGE}DATA_FILES+= data/subexp.in +${PACKAGE}DATA_FILES+= data/subtle.in +${PACKAGE}DATA_FILES+= data/word_bound.in +${PACKAGE}DATA_FILES+= data/zero.in +#${PACKAGE}DATA_FILES+= data/att/README +${PACKAGE}DATA_FILES+= data/att/basic.dat +${PACKAGE}DATA_FILES+= data/att/categorization.dat +${PACKAGE}DATA_FILES+= data/att/forcedassoc.dat +${PACKAGE}DATA_FILES+= data/att/leftassoc.dat +${PACKAGE}DATA_FILES+= data/att/nullsubexpr.dat +${PACKAGE}DATA_FILES+= data/att/repetition.dat +${PACKAGE}DATA_FILES+= data/att/rightassoc.dat NETBSD_ATF_TESTS_C= exhaust_test NETBSD_ATF_TESTS_C+= regex_att_test .for t in ${NETBSD_ATF_TESTS_C} CFLAGS.$t+= -I${TESTSRC} ${IMPLEMENTATION} .endfor .include "../Makefile.netbsd-tests" LIBADD.regex_att_test+= util .include Index: head/lib/libc/tests/resolv/Makefile =================================================================== --- head/lib/libc/tests/resolv/Makefile (revision 299093) +++ head/lib/libc/tests/resolv/Makefile (revision 299094) @@ -1,18 +1,15 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/lib/libc/resolv -BINDIR= ${TESTSDIR} - -FILES+= mach +${PACKAGE}FILES+= mach ATF_TESTS_C+= resolv_test # Note: this test relies on being dynamically linked. You will get a # spurious PASS for a statically linked test. LIBADD.resolv_test+= pthread .include Index: head/lib/libc/tests/rpc/Makefile =================================================================== --- head/lib/libc/tests/rpc/Makefile (revision 299093) +++ head/lib/libc/tests/rpc/Makefile (revision 299094) @@ -1,29 +1,25 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \ h_testbits.h NETBSD_ATF_TESTS_C= rpc_test NETBSD_ATF_TESTS_C+= xdr_test RPCSRC= h_testbits.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C h_testbits.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} h_testbits_xdr.c: ${RPCSRC} h_testbits.h ${RPCGEN} ${.ALLSRC:M*.x} CLEANFILES+= ${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c CFLAGS+= -I${.OBJDIR} LIBADD+= rpcsvc util .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/setjmp/Makefile =================================================================== --- head/lib/libc/tests/setjmp/Makefile (revision 299093) +++ head/lib/libc/tests/setjmp/Makefile (revision 299094) @@ -1,16 +1,12 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= setjmp_test NETBSD_ATF_TESTS_C+= threadjmp_test LIBADD.t_threadjmp+= pthread WARNS?= 4 .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/ssp/Makefile =================================================================== --- head/lib/libc/tests/ssp/Makefile (revision 299093) +++ head/lib/libc/tests/ssp/Makefile (revision 299094) @@ -1,60 +1,56 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NO_WERROR= WARNS?= 2 CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector .if ${COMPILER_TYPE} == "clang" CFLAGS.h_raw+= -fsanitize=bounds .elif ${COMPILER_TYPE} == "gcc" CFLAGS.h_raw+= --param ssp-buffer-size=1 LDADD+= -lssp .endif NETBSD_ATF_TESTS_SH= ssp_test BINDIR= ${TESTSDIR} PROGS= h_fgets PROGS+= h_gets PROGS+= h_getcwd PROGS+= h_memcpy PROGS+= h_memmove PROGS+= h_memset # This testcase doesn't run properly when not compiled with -fsantize=bounds # with clang, which is currently contingent on a compiler_rt update # # XXX: the h_raw/h_read testcases don't cause a SIGABRT with in-tree gcc right # now on amd64 when it trips the stack bounds specified in t_ssp.sh . This # probably needs to be fixed as it's currently hardcoded. # # sanitizer is not tested or supported for ARM right now. sbruno .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${COMPILER_TYPE} == "clang" && ${MK_TOOLCHAIN} == "yes" .if ${COMPILER_VERSION} < 30500 || 30700 <= ${COMPILER_VERSION} PROGS+= h_raw .endif .endif .endif PROGS+= h_read PROGS+= h_readlink PROGS+= h_snprintf PROGS+= h_sprintf PROGS+= h_stpcpy PROGS+= h_stpncpy PROGS+= h_strcat PROGS+= h_strcpy PROGS+= h_strncat PROGS+= h_strncpy PROGS+= h_vsnprintf PROGS+= h_vsprintf .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdio/Makefile =================================================================== --- head/lib/libc/tests/stdio/Makefile (revision 299093) +++ head/lib/libc/tests/stdio/Makefile (revision 299094) @@ -1,46 +1,42 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= fdopen_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test ATF_TESTS_C+= getdelim_test ATF_TESTS_C+= mkostemp_test ATF_TESTS_C+= open_memstream_test ATF_TESTS_C+= open_wmemstream_test ATF_TESTS_C+= perror_test ATF_TESTS_C+= print_positional_test ATF_TESTS_C+= printbasic_test ATF_TESTS_C+= printfloat_test ATF_TESTS_C+= scanfloat_test SRCS.fopen2_test= fopen_test.c NETBSD_ATF_TESTS_C= clearerr_test NETBSD_ATF_TESTS_C+= fflush_test NETBSD_ATF_TESTS_C+= fmemopen_test NETBSD_ATF_TESTS_C+= fopen_test NETBSD_ATF_TESTS_C+= fputc_test NETBSD_ATF_TESTS_C+= mktemp_test NETBSD_ATF_TESTS_C+= popen_test NETBSD_ATF_TESTS_C+= printf_test NETBSD_ATF_TESTS_C+= scanf_test LIBADD.printfloat_test+= m LIBADD.scanfloat_test+= m .if ${COMPILER_TYPE} == "gcc" # 90: use of assignment suppression and length modifier together in scanf format PROG_OVERRIDE_VARS+= NO_WFORMAT NO_WFORMAT.scanfloat_test= .endif .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdlib/Makefile =================================================================== --- head/lib/libc/tests/stdlib/Makefile (revision 299093) +++ head/lib/libc/tests/stdlib/Makefile (revision 299094) @@ -1,49 +1,45 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= heapsort_test ATF_TESTS_C+= mergesort_test ATF_TESTS_C+= qsort_test ATF_TESTS_C+= tsearch_test # TODO: t_getenv_thread, t_mi_vector_hash NETBSD_ATF_TESTS_C+= abs_test NETBSD_ATF_TESTS_C+= atoi_test NETBSD_ATF_TESTS_C+= div_test NETBSD_ATF_TESTS_C+= getenv_test NETBSD_ATF_TESTS_C+= exit_test NETBSD_ATF_TESTS_C+= hsearch_test NETBSD_ATF_TESTS_C+= posix_memalign_test NETBSD_ATF_TESTS_C+= random_test NETBSD_ATF_TESTS_C+= strtod_test NETBSD_ATF_TESTS_C+= strtol_test NETBSD_ATF_TESTS_C+= system_test # TODO: need to come up with a correct explanation of what the patch pho does # with h_atexit #ATF_TESTS_SH= atexit_test NETBSD_ATF_TESTS_SH= getopt_test .include "../Makefile.netbsd-tests" BINDIR= ${TESTSDIR} # TODO: see comment above #PROGS+= h_atexit PROGS+= h_getopt h_getopt_long CFLAGS+= -I${.CURDIR} .for t in h_getopt h_getopt_long CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR} LIBADD.${t}+= netbsd util .endfor LIBADD.strtod_test+= m .include Index: head/lib/libc/tests/string/Makefile =================================================================== --- head/lib/libc/tests/string/Makefile (revision 299093) +++ head/lib/libc/tests/string/Makefile (revision 299094) @@ -1,38 +1,34 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= wcscasecmp_test ATF_TESTS_C+= wcsnlen_test # TODO: popcount, stresep NETBSD_ATF_TESTS_C+= memchr_test NETBSD_ATF_TESTS_C+= memcpy_test NETBSD_ATF_TESTS_C+= memmem_test NETBSD_ATF_TESTS_C+= memset_test NETBSD_ATF_TESTS_C+= strcat_test NETBSD_ATF_TESTS_C+= strchr_test NETBSD_ATF_TESTS_C+= strcmp_test NETBSD_ATF_TESTS_C+= strcpy_test NETBSD_ATF_TESTS_C+= strcspn_test NETBSD_ATF_TESTS_C+= strerror_test NETBSD_ATF_TESTS_C+= strlen_test NETBSD_ATF_TESTS_C+= strpbrk_test NETBSD_ATF_TESTS_C+= strrchr_test NETBSD_ATF_TESTS_C+= strspn_test NETBSD_ATF_TESTS_C+= swab_test SRCS.strerror2_test= strerror_test.c .include "../Makefile.netbsd-tests" LIBADD.memchr_test+= md LIBADD.memcpy_test+= md .include Index: head/lib/libc/tests/sys/Makefile =================================================================== --- head/lib/libc/tests/sys/Makefile (revision 299093) +++ head/lib/libc/tests/sys/Makefile (revision 299094) @@ -1,89 +1,84 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= queue_test # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg, # swapcontext NETBSD_ATF_TESTS_C+= access_test NETBSD_ATF_TESTS_C+= chroot_test NETBSD_ATF_TESTS_C+= clock_gettime_test NETBSD_ATF_TESTS_C+= connect_test NETBSD_ATF_TESTS_C+= dup_test NETBSD_ATF_TESTS_C+= fsync_test NETBSD_ATF_TESTS_C+= getcontext_test NETBSD_ATF_TESTS_C+= getgroups_test NETBSD_ATF_TESTS_C+= getitimer_test NETBSD_ATF_TESTS_C+= getlogin_test NETBSD_ATF_TESTS_C+= getpid_test NETBSD_ATF_TESTS_C+= getrusage_test NETBSD_ATF_TESTS_C+= getsid_test NETBSD_ATF_TESTS_C+= gettimeofday_test NETBSD_ATF_TESTS_C+= issetugid_test NETBSD_ATF_TESTS_C+= kevent_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= link_test NETBSD_ATF_TESTS_C+= listen_test NETBSD_ATF_TESTS_C+= mincore_test NETBSD_ATF_TESTS_C+= mkdir_test NETBSD_ATF_TESTS_C+= mkfifo_test NETBSD_ATF_TESTS_C+= mknod_test NETBSD_ATF_TESTS_C+= mlock_test NETBSD_ATF_TESTS_C+= mmap_test NETBSD_ATF_TESTS_C+= mprotect_test NETBSD_ATF_TESTS_C+= msgctl_test NETBSD_ATF_TESTS_C+= msgget_test NETBSD_ATF_TESTS_C+= msgrcv_test NETBSD_ATF_TESTS_C+= msgsnd_test NETBSD_ATF_TESTS_C+= msync_test NETBSD_ATF_TESTS_C+= nanosleep_test NETBSD_ATF_TESTS_C+= pipe_test NETBSD_ATF_TESTS_C+= pipe2_test NETBSD_ATF_TESTS_C+= poll_test NETBSD_ATF_TESTS_C+= revoke_test NETBSD_ATF_TESTS_C+= select_test NETBSD_ATF_TESTS_C+= setrlimit_test NETBSD_ATF_TESTS_C+= setuid_test NETBSD_ATF_TESTS_C+= sigaction_test NETBSD_ATF_TESTS_C+= sigqueue_test NETBSD_ATF_TESTS_C+= sigtimedwait_test NETBSD_ATF_TESTS_C+= socketpair_test NETBSD_ATF_TESTS_C+= stat_test NETBSD_ATF_TESTS_C+= timer_create_test NETBSD_ATF_TESTS_C+= truncate_test NETBSD_ATF_TESTS_C+= ucontext_test NETBSD_ATF_TESTS_C+= umask_test NETBSD_ATF_TESTS_C+= unlink_test NETBSD_ATF_TESTS_C+= write_test LIBADD.getpid_test+= pthread LIBADD.timer_create_test+= rt .include "../Makefile.netbsd-tests" .if ${COMPILER_TYPE} == "gcc" WARNS?= 3 .else WARNS?= 4 .endif -FILESGROUPS+= FILES truncate_test_FILES +FILESGROUPS+= truncate_test_FILES truncate_test_FILES= truncate_test.root_owned truncate_test_FILESDIR= ${TESTSDIR} truncate_test_FILESMODE= 0600 truncate_test_FILESOWNER= root truncate_test_FILESGRP= wheel truncate_test_FILESPACKAGE= ${PACKAGE} -FILESPACKAGE= ${PACKAGE} CLEANFILES= truncate_test.root_owned truncate_test.root_owned: dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none .include Index: head/lib/libc/tests/termios/Makefile =================================================================== --- head/lib/libc/tests/termios/Makefile (revision 299093) +++ head/lib/libc/tests/termios/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= tcsetpgrp_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/time/Makefile =================================================================== --- head/lib/libc/tests/time/Makefile (revision 299093) +++ head/lib/libc/tests/time/Makefile (revision 299094) @@ -1,14 +1,10 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_C= mktime_test NETBSD_ATF_TESTS_C+= strptime_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/tls/Makefile =================================================================== --- head/lib/libc/tests/tls/Makefile (revision 299093) +++ head/lib/libc/tests/tls/Makefile (revision 299094) @@ -1,37 +1,33 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - .if !defined(NO_PIC) SUBDIR+= dso .endif # TODO: doesn't link properly (for some odd reason it's trying to link in # libatf.so) #NETBSD_ATF_TESTS_C= tls_static_test .if !defined(NO_PIC) NETBSD_ATF_TESTS_C+= tls_dlopen_test NETBSD_ATF_TESTS_C+= tls_dynamic_test .endif .include "../Makefile.netbsd-tests" DSODIR= ${.OBJDIR}/../tls_dso LIBADD.tls_static_test+= pthread LDFLAGS.tls_static_test+= -static SRCS.tls_static_test= t_tls_static.c t_tls_static_helper.c DPADD.tls_dynamic_test+= ${DSODIR}/libh_tls_dynamic.so LDADD.tls_dynamic_test+= -lh_tls_dynamic LDFLAGS.tls_dynamic_test+= -Wl,-rpath,${TESTSDIR} -L${DSODIR} LIBADD.tls_dynamic_test+= pthread LIBADD.tls_dlopen_test+= pthread LDFLAGS.tls_dlopen_test+= -Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic .include Index: head/lib/libc/tests/tls/dso/Makefile =================================================================== --- head/lib/libc/tests/tls/dso/Makefile (revision 299093) +++ head/lib/libc/tests/tls/dso/Makefile (revision 299094) @@ -1,21 +1,16 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - -OBJTOP= ${.OBJDIR:H:H:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T} LIB= h_tls_dlopen SHLIB_NAME= h_tls_dlopen.so SRCS= h_tls_dlopen.c MAN= LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/tls_dso/Makefile =================================================================== --- head/lib/libc/tests/tls_dso/Makefile (revision 299093) +++ head/lib/libc/tests/tls_dso/Makefile (revision 299094) @@ -1,24 +1,20 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - LIB= h_tls_dynamic SRCS= h_tls_dynamic.c LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 WITHOUT_STATIC= WITHOUT_PROFILE= WITHOUT_PIC= MAN= .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/ttyio/Makefile =================================================================== --- head/lib/libc/tests/ttyio/Makefile (revision 299093) +++ head/lib/libc/tests/ttyio/Makefile (revision 299094) @@ -1,16 +1,12 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - # TODO: ptm_test NETBSD_ATF_TESTS_C= ttyio_test LIBADD.ttyio_test+= util .include "../Makefile.netbsd-tests" .include Index: head/lib/libcrypt/tests/Makefile =================================================================== --- head/lib/libcrypt/tests/Makefile (revision 299093) +++ head/lib/libcrypt/tests/Makefile (revision 299094) @@ -1,16 +1,12 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= crypt_tests NETBSD_ATF_TESTS_C+= crypt_test CFLAGS+= -I${.CURDIR:H} LIBADD= crypt .include .include Index: head/lib/libmp/tests/Makefile =================================================================== --- head/lib/libmp/tests/Makefile (revision 299093) +++ head/lib/libmp/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_C+= legacy_test LIBADD+= mp .include Index: head/lib/libnv/tests/Makefile =================================================================== --- head/lib/libnv/tests/Makefile (revision 299093) +++ head/lib/libnv/tests/Makefile (revision 299094) @@ -1,23 +1,19 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_CXX= \ dnv_tests \ nv_array_tests \ nv_tests \ TAP_TESTS_C+= nvlist_add_test TAP_TESTS_C+= nvlist_exists_test TAP_TESTS_C+= nvlist_free_test TAP_TESTS_C+= nvlist_get_test TAP_TESTS_C+= nvlist_move_test TAP_TESTS_C+= nvlist_send_recv_test LIBADD+= nv WARNS?= 3 .include Index: head/lib/libpam/libpam/tests/Makefile =================================================================== --- head/lib/libpam/libpam/tests/Makefile (revision 299093) +++ head/lib/libpam/libpam/tests/Makefile (revision 299094) @@ -1,22 +1,18 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/t TESTSDIR = ${TESTSBASE}/lib/libpam COMMONSRC = t_file.c t_main.c .for test in t_openpam_ctype t_openpam_readlinev t_openpam_readword TAP_TESTS_C += ${test} SRCS.${test} = ${test}.c ${COMMONSRC} .endfor CFLAGS +=-I${OPENPAM}/include -I${OPENPAM}/lib/libpam -I${OPENPAM}/t WARNS ?= 6 LIBADD = pam .include Index: head/lib/libproc/tests/Makefile =================================================================== --- head/lib/libproc/tests/Makefile (revision 299093) +++ head/lib/libproc/tests/Makefile (revision 299094) @@ -1,19 +1,15 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C+= proc_test PROGS= target_prog SRCS_target_prog= target_prog.c BINDIR_target_prog= ${TESTSDIR} LIBADD= elf proc rtld_db util # Ensure that symbols aren't stripped from the test program, as they're needed # for testing symbol lookup. STRIP= .include Index: head/lib/librt/tests/Makefile =================================================================== --- head/lib/librt/tests/Makefile (revision 299093) +++ head/lib/librt/tests/Makefile (revision 299094) @@ -1,14 +1,10 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - LIBADD= rt NETBSD_ATF_TESTS_C= sched_test NETBSD_ATF_TESTS_C+= sem_test .include .include Index: head/lib/libthr/tests/Makefile =================================================================== --- head/lib/libthr/tests/Makefile (revision 299093) +++ head/lib/libthr/tests/Makefile (revision 299094) @@ -1,56 +1,54 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread # TODO: t_name (missing pthread_getname_np support in FreeBSD) NETBSD_ATF_TESTS_C= barrier_test NETBSD_ATF_TESTS_C+= cond_test NETBSD_ATF_TESTS_C+= condwait_test NETBSD_ATF_TESTS_C+= detach_test NETBSD_ATF_TESTS_C+= equal_test NETBSD_ATF_TESTS_C+= fork_test NETBSD_ATF_TESTS_C+= fpu_test NETBSD_ATF_TESTS_C+= join_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= mutex_test NETBSD_ATF_TESTS_C+= once_test NETBSD_ATF_TESTS_C+= preempt_test NETBSD_ATF_TESTS_C+= rwlock_test NETBSD_ATF_TESTS_C+= sem_test NETBSD_ATF_TESTS_C+= sigmask_test NETBSD_ATF_TESTS_C+= sigsuspend_test NETBSD_ATF_TESTS_C+= siglongjmp_test NETBSD_ATF_TESTS_C+= sleep_test .if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext NETBSD_ATF_TESTS_C+= swapcontext_test .endif NETBSD_ATF_TESTS_SH= atexit_test NETBSD_ATF_TESTS_SH+= cancel_test NETBSD_ATF_TESTS_SH+= exit_test NETBSD_ATF_TESTS_SH+= resolv_test LIBADD+= pthread LIBADD.fpu_test+= m LIBADD.sem_test+= rt BINDIR= ${TESTSDIR} PROGS= h_atexit PROGS+= h_cancel PROGS+= h_exit PROGS+= h_resolv -FILESDIR= ${TESTSDIR} -FILES= d_mach +${PACKAGE}FILES+= d_mach TESTS_SUBDIRS= dlopen .include CFLAGS.condwait_test+= -I${SRCTOP}/contrib/netbsd-tests/lib/libc/gen .include Index: head/lib/libthr/tests/dlopen/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/Makefile (revision 299093) +++ head/lib/libthr/tests/dlopen/Makefile (revision 299094) @@ -1,30 +1,27 @@ # $FreeBSD$ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen CFLAGS+= -DTESTDIR=\"${TESTSDIR:Q}/\" LDFLAGS+= -L${.OBJDIR}/dso -Wl,-rpath=${TESTDIR} .if !defined(NO_PIC) SUBDIR+= dso NETBSD_ATF_TESTS_C= dlopen_test NETBSD_ATF_TESTS_C+= main_pthread_create_test # XXX: this blocks running the testcase #NETBSD_ATF_TESTS_C+= dso_pthread_create_test .for t in dlopen_test main_pthread_create_test LIBADD.${t}+= pthread .endfor .endif .include .include Index: head/lib/libthr/tests/dlopen/dso/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/dso/Makefile (revision 299093) +++ head/lib/libthr/tests/dlopen/dso/Makefile (revision 299094) @@ -1,21 +1,16 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - -OBJTOP= ${.OBJDIR:H:H:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso SHLIB= h_pthread_dlopen SHLIB_MAJOR= 1 SHLIB_NAME= h_pthread_dlopen.so.${SHLIB_MAJOR} SRCS= h_pthread_dlopen.c LIBADD+= pthread LIBDIR= ${TESTSBASE}/lib/libthr/dlopen .include .include Index: head/lib/libutil/tests/Makefile =================================================================== --- head/lib/libutil/tests/Makefile (revision 299093) +++ head/lib/libutil/tests/Makefile (revision 299094) @@ -1,18 +1,14 @@ # $FreeBSD$ -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test .if ${MACHINE_CPUARCH} != "aarch64" # PR202304: pidfile_test hangs on arm64 TAP_TESTS_C+= pidfile_test .endif TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test LIBADD+= util .include Index: head/lib/libxo/tests/Makefile =================================================================== --- head/lib/libxo/tests/Makefile (revision 299093) +++ head/lib/libxo/tests/Makefile (revision 299094) @@ -1,258 +1,254 @@ # $FreeBSD$ .include PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} LIBXOSRC= ${SRCTOP}/contrib/libxo # Override the default suffix transformation rules for .c/.o -> .out .SUFFIXES: .SUFFIXES: .c .err .o .out .sh .PATH: .PATH.c: ${LIBXOSRC}/libxo ${LIBXOSRC}/tests/core .PATH.err: ${LIBXOSRC}/tests/core/saved .PATH.out: ${LIBXOSRC}/tests/core/saved .c.out .o.out: -TESTSDIR= ${TESTSBASE}/lib/libxo - ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} -FILES+= test_01.E.err -FILES+= test_01.E.out -FILES+= test_01.H.err -FILES+= test_01.H.out -FILES+= test_01.HIPx.err -FILES+= test_01.HIPx.out -FILES+= test_01.HP.err -FILES+= test_01.HP.out -FILES+= test_01.J.err -FILES+= test_01.J.out -FILES+= test_01.JP.err -FILES+= test_01.JP.out -FILES+= test_01.T.err -FILES+= test_01.T.out -FILES+= test_01.X.err -FILES+= test_01.X.out -FILES+= test_01.XP.err -FILES+= test_01.XP.out -FILES+= test_01.err -FILES+= test_01.out -FILES+= test_02.E.err -FILES+= test_02.E.out -FILES+= test_02.H.err -FILES+= test_02.H.out -FILES+= test_02.HIPx.err -FILES+= test_02.HIPx.out -FILES+= test_02.HP.err -FILES+= test_02.HP.out -FILES+= test_02.J.err -FILES+= test_02.J.out -FILES+= test_02.JP.err -FILES+= test_02.JP.out -FILES+= test_02.T.err -FILES+= test_02.T.out -FILES+= test_02.X.err -FILES+= test_02.X.out -FILES+= test_02.XP.err -FILES+= test_02.XP.out -FILES+= test_02.err -FILES+= test_02.out -FILES+= test_03.E.err -FILES+= test_03.E.out -FILES+= test_03.H.err -FILES+= test_03.H.out -FILES+= test_03.HIPx.err -FILES+= test_03.HIPx.out -FILES+= test_03.HP.err -FILES+= test_03.HP.out -FILES+= test_03.J.err -FILES+= test_03.J.out -FILES+= test_03.JP.err -FILES+= test_03.JP.out -FILES+= test_03.T.err -FILES+= test_03.T.out -FILES+= test_03.X.err -FILES+= test_03.X.out -FILES+= test_03.XP.err -FILES+= test_03.XP.out -FILES+= test_03.err -FILES+= test_03.out -FILES+= test_04.E.err -FILES+= test_04.E.out -FILES+= test_04.H.err -FILES+= test_04.H.out -FILES+= test_04.HIPx.err -FILES+= test_04.HIPx.out -FILES+= test_04.HP.err -FILES+= test_04.HP.out -FILES+= test_04.J.err -FILES+= test_04.J.out -FILES+= test_04.JP.err -FILES+= test_04.JP.out -FILES+= test_04.T.err -FILES+= test_04.T.out -FILES+= test_04.X.err -FILES+= test_04.X.out -FILES+= test_04.XP.err -FILES+= test_04.XP.out -FILES+= test_05.E.err -FILES+= test_05.E.out -FILES+= test_05.H.err -FILES+= test_05.H.out -FILES+= test_05.HIPx.err -FILES+= test_05.HIPx.out -FILES+= test_05.HP.err -FILES+= test_05.HP.out -FILES+= test_05.J.err -FILES+= test_05.J.out -FILES+= test_05.JP.err -FILES+= test_05.JP.out -FILES+= test_05.T.err -FILES+= test_05.T.out -FILES+= test_05.X.err -FILES+= test_05.X.out -FILES+= test_05.XP.err -FILES+= test_05.XP.out -FILES+= test_06.E.err -FILES+= test_06.E.out -FILES+= test_06.H.err -FILES+= test_06.H.out -FILES+= test_06.HIPx.err -FILES+= test_06.HIPx.out -FILES+= test_06.HP.err -FILES+= test_06.HP.out -FILES+= test_06.J.err -FILES+= test_06.J.out -FILES+= test_06.JP.err -FILES+= test_06.JP.out -FILES+= test_06.T.err -FILES+= test_06.T.out -FILES+= test_06.X.err -FILES+= test_06.X.out -FILES+= test_06.XP.err -FILES+= test_06.XP.out -FILES+= test_07.E.err -FILES+= test_07.E.out -FILES+= test_07.H.err -FILES+= test_07.H.out -FILES+= test_07.HIPx.err -FILES+= test_07.HIPx.out -FILES+= test_07.HP.err -FILES+= test_07.HP.out -FILES+= test_07.J.err -FILES+= test_07.J.out -FILES+= test_07.JP.err -FILES+= test_07.JP.out -FILES+= test_07.T.err -FILES+= test_07.T.out -FILES+= test_07.X.err -FILES+= test_07.X.out -FILES+= test_07.XP.err -FILES+= test_07.XP.out -FILES+= test_08.E.err -FILES+= test_08.E.out -FILES+= test_08.H.err -FILES+= test_08.H.out -FILES+= test_08.HIPx.err -FILES+= test_08.HIPx.out -FILES+= test_08.HP.err -FILES+= test_08.HP.out -FILES+= test_08.J.err -FILES+= test_08.J.out -FILES+= test_08.JP.err -FILES+= test_08.JP.out -FILES+= test_08.T.err -FILES+= test_08.T.out -FILES+= test_08.X.err -FILES+= test_08.X.out -FILES+= test_08.XP.err -FILES+= test_08.XP.out -FILES+= test_09.E.err -FILES+= test_09.E.out -FILES+= test_09.H.err -FILES+= test_09.H.out -FILES+= test_09.HIPx.err -FILES+= test_09.HIPx.out -FILES+= test_09.HP.err -FILES+= test_09.HP.out -FILES+= test_09.J.err -FILES+= test_09.J.out -FILES+= test_09.JP.err -FILES+= test_09.JP.out -FILES+= test_09.T.err -FILES+= test_09.T.out -FILES+= test_09.X.err -FILES+= test_09.X.out -FILES+= test_09.XP.err -FILES+= test_09.XP.out -FILES+= test_10.E.err -FILES+= test_10.E.out -FILES+= test_10.H.err -FILES+= test_10.H.out -FILES+= test_10.HIPx.err -FILES+= test_10.HIPx.out -FILES+= test_10.HP.err -FILES+= test_10.HP.out -FILES+= test_10.J.err -FILES+= test_10.J.out -FILES+= test_10.JP.err -FILES+= test_10.JP.out -FILES+= test_10.T.err -FILES+= test_10.T.out -FILES+= test_10.X.err -FILES+= test_10.X.out -FILES+= test_10.XP.err -FILES+= test_10.XP.out -FILES+= test_10.err -FILES+= test_10.out -FILES+= test_11.E.err -FILES+= test_11.E.out -FILES+= test_11.H.err -FILES+= test_11.H.out -FILES+= test_11.HIPx.err -FILES+= test_11.HIPx.out -FILES+= test_11.HP.err -FILES+= test_11.HP.out -FILES+= test_11.J.err -FILES+= test_11.J.out -FILES+= test_11.JP.err -FILES+= test_11.JP.out -FILES+= test_11.T.err -FILES+= test_11.T.out -FILES+= test_11.X.err -FILES+= test_11.X.out -FILES+= test_11.XP.err -FILES+= test_11.XP.out +${PACKAGE}FILES+= test_01.E.err +${PACKAGE}FILES+= test_01.E.out +${PACKAGE}FILES+= test_01.H.err +${PACKAGE}FILES+= test_01.H.out +${PACKAGE}FILES+= test_01.HIPx.err +${PACKAGE}FILES+= test_01.HIPx.out +${PACKAGE}FILES+= test_01.HP.err +${PACKAGE}FILES+= test_01.HP.out +${PACKAGE}FILES+= test_01.J.err +${PACKAGE}FILES+= test_01.J.out +${PACKAGE}FILES+= test_01.JP.err +${PACKAGE}FILES+= test_01.JP.out +${PACKAGE}FILES+= test_01.T.err +${PACKAGE}FILES+= test_01.T.out +${PACKAGE}FILES+= test_01.X.err +${PACKAGE}FILES+= test_01.X.out +${PACKAGE}FILES+= test_01.XP.err +${PACKAGE}FILES+= test_01.XP.out +${PACKAGE}FILES+= test_01.err +${PACKAGE}FILES+= test_01.out +${PACKAGE}FILES+= test_02.E.err +${PACKAGE}FILES+= test_02.E.out +${PACKAGE}FILES+= test_02.H.err +${PACKAGE}FILES+= test_02.H.out +${PACKAGE}FILES+= test_02.HIPx.err +${PACKAGE}FILES+= test_02.HIPx.out +${PACKAGE}FILES+= test_02.HP.err +${PACKAGE}FILES+= test_02.HP.out +${PACKAGE}FILES+= test_02.J.err +${PACKAGE}FILES+= test_02.J.out +${PACKAGE}FILES+= test_02.JP.err +${PACKAGE}FILES+= test_02.JP.out +${PACKAGE}FILES+= test_02.T.err +${PACKAGE}FILES+= test_02.T.out +${PACKAGE}FILES+= test_02.X.err +${PACKAGE}FILES+= test_02.X.out +${PACKAGE}FILES+= test_02.XP.err +${PACKAGE}FILES+= test_02.XP.out +${PACKAGE}FILES+= test_02.err +${PACKAGE}FILES+= test_02.out +${PACKAGE}FILES+= test_03.E.err +${PACKAGE}FILES+= test_03.E.out +${PACKAGE}FILES+= test_03.H.err +${PACKAGE}FILES+= test_03.H.out +${PACKAGE}FILES+= test_03.HIPx.err +${PACKAGE}FILES+= test_03.HIPx.out +${PACKAGE}FILES+= test_03.HP.err +${PACKAGE}FILES+= test_03.HP.out +${PACKAGE}FILES+= test_03.J.err +${PACKAGE}FILES+= test_03.J.out +${PACKAGE}FILES+= test_03.JP.err +${PACKAGE}FILES+= test_03.JP.out +${PACKAGE}FILES+= test_03.T.err +${PACKAGE}FILES+= test_03.T.out +${PACKAGE}FILES+= test_03.X.err +${PACKAGE}FILES+= test_03.X.out +${PACKAGE}FILES+= test_03.XP.err +${PACKAGE}FILES+= test_03.XP.out +${PACKAGE}FILES+= test_03.err +${PACKAGE}FILES+= test_03.out +${PACKAGE}FILES+= test_04.E.err +${PACKAGE}FILES+= test_04.E.out +${PACKAGE}FILES+= test_04.H.err +${PACKAGE}FILES+= test_04.H.out +${PACKAGE}FILES+= test_04.HIPx.err +${PACKAGE}FILES+= test_04.HIPx.out +${PACKAGE}FILES+= test_04.HP.err +${PACKAGE}FILES+= test_04.HP.out +${PACKAGE}FILES+= test_04.J.err +${PACKAGE}FILES+= test_04.J.out +${PACKAGE}FILES+= test_04.JP.err +${PACKAGE}FILES+= test_04.JP.out +${PACKAGE}FILES+= test_04.T.err +${PACKAGE}FILES+= test_04.T.out +${PACKAGE}FILES+= test_04.X.err +${PACKAGE}FILES+= test_04.X.out +${PACKAGE}FILES+= test_04.XP.err +${PACKAGE}FILES+= test_04.XP.out +${PACKAGE}FILES+= test_05.E.err +${PACKAGE}FILES+= test_05.E.out +${PACKAGE}FILES+= test_05.H.err +${PACKAGE}FILES+= test_05.H.out +${PACKAGE}FILES+= test_05.HIPx.err +${PACKAGE}FILES+= test_05.HIPx.out +${PACKAGE}FILES+= test_05.HP.err +${PACKAGE}FILES+= test_05.HP.out +${PACKAGE}FILES+= test_05.J.err +${PACKAGE}FILES+= test_05.J.out +${PACKAGE}FILES+= test_05.JP.err +${PACKAGE}FILES+= test_05.JP.out +${PACKAGE}FILES+= test_05.T.err +${PACKAGE}FILES+= test_05.T.out +${PACKAGE}FILES+= test_05.X.err +${PACKAGE}FILES+= test_05.X.out +${PACKAGE}FILES+= test_05.XP.err +${PACKAGE}FILES+= test_05.XP.out +${PACKAGE}FILES+= test_06.E.err +${PACKAGE}FILES+= test_06.E.out +${PACKAGE}FILES+= test_06.H.err +${PACKAGE}FILES+= test_06.H.out +${PACKAGE}FILES+= test_06.HIPx.err +${PACKAGE}FILES+= test_06.HIPx.out +${PACKAGE}FILES+= test_06.HP.err +${PACKAGE}FILES+= test_06.HP.out +${PACKAGE}FILES+= test_06.J.err +${PACKAGE}FILES+= test_06.J.out +${PACKAGE}FILES+= test_06.JP.err +${PACKAGE}FILES+= test_06.JP.out +${PACKAGE}FILES+= test_06.T.err +${PACKAGE}FILES+= test_06.T.out +${PACKAGE}FILES+= test_06.X.err +${PACKAGE}FILES+= test_06.X.out +${PACKAGE}FILES+= test_06.XP.err +${PACKAGE}FILES+= test_06.XP.out +${PACKAGE}FILES+= test_07.E.err +${PACKAGE}FILES+= test_07.E.out +${PACKAGE}FILES+= test_07.H.err +${PACKAGE}FILES+= test_07.H.out +${PACKAGE}FILES+= test_07.HIPx.err +${PACKAGE}FILES+= test_07.HIPx.out +${PACKAGE}FILES+= test_07.HP.err +${PACKAGE}FILES+= test_07.HP.out +${PACKAGE}FILES+= test_07.J.err +${PACKAGE}FILES+= test_07.J.out +${PACKAGE}FILES+= test_07.JP.err +${PACKAGE}FILES+= test_07.JP.out +${PACKAGE}FILES+= test_07.T.err +${PACKAGE}FILES+= test_07.T.out +${PACKAGE}FILES+= test_07.X.err +${PACKAGE}FILES+= test_07.X.out +${PACKAGE}FILES+= test_07.XP.err +${PACKAGE}FILES+= test_07.XP.out +${PACKAGE}FILES+= test_08.E.err +${PACKAGE}FILES+= test_08.E.out +${PACKAGE}FILES+= test_08.H.err +${PACKAGE}FILES+= test_08.H.out +${PACKAGE}FILES+= test_08.HIPx.err +${PACKAGE}FILES+= test_08.HIPx.out +${PACKAGE}FILES+= test_08.HP.err +${PACKAGE}FILES+= test_08.HP.out +${PACKAGE}FILES+= test_08.J.err +${PACKAGE}FILES+= test_08.J.out +${PACKAGE}FILES+= test_08.JP.err +${PACKAGE}FILES+= test_08.JP.out +${PACKAGE}FILES+= test_08.T.err +${PACKAGE}FILES+= test_08.T.out +${PACKAGE}FILES+= test_08.X.err +${PACKAGE}FILES+= test_08.X.out +${PACKAGE}FILES+= test_08.XP.err +${PACKAGE}FILES+= test_08.XP.out +${PACKAGE}FILES+= test_09.E.err +${PACKAGE}FILES+= test_09.E.out +${PACKAGE}FILES+= test_09.H.err +${PACKAGE}FILES+= test_09.H.out +${PACKAGE}FILES+= test_09.HIPx.err +${PACKAGE}FILES+= test_09.HIPx.out +${PACKAGE}FILES+= test_09.HP.err +${PACKAGE}FILES+= test_09.HP.out +${PACKAGE}FILES+= test_09.J.err +${PACKAGE}FILES+= test_09.J.out +${PACKAGE}FILES+= test_09.JP.err +${PACKAGE}FILES+= test_09.JP.out +${PACKAGE}FILES+= test_09.T.err +${PACKAGE}FILES+= test_09.T.out +${PACKAGE}FILES+= test_09.X.err +${PACKAGE}FILES+= test_09.X.out +${PACKAGE}FILES+= test_09.XP.err +${PACKAGE}FILES+= test_09.XP.out +${PACKAGE}FILES+= test_10.E.err +${PACKAGE}FILES+= test_10.E.out +${PACKAGE}FILES+= test_10.H.err +${PACKAGE}FILES+= test_10.H.out +${PACKAGE}FILES+= test_10.HIPx.err +${PACKAGE}FILES+= test_10.HIPx.out +${PACKAGE}FILES+= test_10.HP.err +${PACKAGE}FILES+= test_10.HP.out +${PACKAGE}FILES+= test_10.J.err +${PACKAGE}FILES+= test_10.J.out +${PACKAGE}FILES+= test_10.JP.err +${PACKAGE}FILES+= test_10.JP.out +${PACKAGE}FILES+= test_10.T.err +${PACKAGE}FILES+= test_10.T.out +${PACKAGE}FILES+= test_10.X.err +${PACKAGE}FILES+= test_10.X.out +${PACKAGE}FILES+= test_10.XP.err +${PACKAGE}FILES+= test_10.XP.out +${PACKAGE}FILES+= test_10.err +${PACKAGE}FILES+= test_10.out +${PACKAGE}FILES+= test_11.E.err +${PACKAGE}FILES+= test_11.E.out +${PACKAGE}FILES+= test_11.H.err +${PACKAGE}FILES+= test_11.H.out +${PACKAGE}FILES+= test_11.HIPx.err +${PACKAGE}FILES+= test_11.HIPx.out +${PACKAGE}FILES+= test_11.HP.err +${PACKAGE}FILES+= test_11.HP.out +${PACKAGE}FILES+= test_11.J.err +${PACKAGE}FILES+= test_11.J.out +${PACKAGE}FILES+= test_11.JP.err +${PACKAGE}FILES+= test_11.JP.out +${PACKAGE}FILES+= test_11.T.err +${PACKAGE}FILES+= test_11.T.out +${PACKAGE}FILES+= test_11.X.err +${PACKAGE}FILES+= test_11.X.out +${PACKAGE}FILES+= test_11.XP.err +${PACKAGE}FILES+= test_11.XP.out PROGS+= test_01 PROGS+= test_02 PROGS+= test_03 PROGS+= test_04 PROGS+= test_05 PROGS+= test_06 PROGS+= test_07 PROGS+= test_08 PROGS+= test_09 PROGS+= test_10 PROGS+= test_11 CFLAGS+= -I${LIBXOSRC}/libxo -I${.CURDIR:H} LIBADD= xo util SUBDIR+= encoder .if ${MACHINE} == "host" # make it easy to test without install TESTSDIR= ${.OBJDIR} .endif .include Index: head/lib/libxo/tests/encoder/Makefile =================================================================== --- head/lib/libxo/tests/encoder/Makefile (revision 299093) +++ head/lib/libxo/tests/encoder/Makefile (revision 299094) @@ -1,23 +1,19 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/test SHLIB_NAME= libenc_test.so LIBDIR= ${TESTSBASE}/lib/libxo SYMLINKS+= ${LIBDIR}/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc SRCS= enc_test.c CFLAGS+= -I${LIBXOSRC}/libxo LIBADD= xo .include Index: head/lib/msun/tests/Makefile =================================================================== --- head/lib/msun/tests/Makefile (revision 299093) +++ head/lib/msun/tests/Makefile (revision 299094) @@ -1,106 +1,103 @@ # $FreeBSD$ .include -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm # All architectures on FreeBSD have fenv.h CFLAGS+= -DHAVE_FENV_H # Not sure why this isn't defined for all architectures, since most # have long double. .if ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" CFLAGS+= -D__HAVE_LONG_DOUBLE .endif NETBSD_ATF_TESTS_C= acos_test NETBSD_ATF_TESTS_C+= asin_test NETBSD_ATF_TESTS_C+= atan_test NETBSD_ATF_TESTS_C+= cbrt_test NETBSD_ATF_TESTS_C+= ceil_test NETBSD_ATF_TESTS_C+= cos_test NETBSD_ATF_TESTS_C+= cosh_test NETBSD_ATF_TESTS_C+= erf_test NETBSD_ATF_TESTS_C+= exp_test NETBSD_ATF_TESTS_C+= fmod_test NETBSD_ATF_TESTS_C+= infinity_test NETBSD_ATF_TESTS_C+= ldexp_test NETBSD_ATF_TESTS_C+= log_test NETBSD_ATF_TESTS_C+= pow_test NETBSD_ATF_TESTS_C+= precision_test NETBSD_ATF_TESTS_C+= round_test NETBSD_ATF_TESTS_C+= scalbn_test NETBSD_ATF_TESTS_C+= sin_test NETBSD_ATF_TESTS_C+= sinh_test NETBSD_ATF_TESTS_C+= sqrt_test NETBSD_ATF_TESTS_C+= tan_test NETBSD_ATF_TESTS_C+= tanh_test TAP_TESTS_C+= cexp_test TAP_TESTS_C+= conj_test .if ${MACHINE_CPUARCH} != "aarch64" # Hits an assert in llvm when building for arm64: # https://llvm.org/bugs/show_bug.cgi?id=26081 TAP_TESTS_C+= csqrt_test .endif TAP_TESTS_C+= ctrig_test TAP_TESTS_C+= exponential_test TAP_TESTS_C+= fenv_test TAP_TESTS_C+= fma_test # clang 3.8.0 fails always fails this test. See: bug 208703 # # XXX: depending on this compiler version check doesn't work at # buildworld/installworld time, which results in jenkins failures (bug 208963) # because the build is run on a 10.x instance, which has an older clang # compiler. # #.if ! (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} == 30800) #TAP_TESTS_C+= fmaxmin_test #.endif TAP_TESTS_C+= ilogb_test TAP_TESTS_C+= invtrig_test TAP_TESTS_C+= invctrig_test TAP_TESTS_C+= logarithm_test TAP_TESTS_C+= lrint_test # XXX: the testcase crashes on all platforms, but only on head # (bug 205451) #TAP_TESTS_C+= lround_test TAP_TESTS_C+= nan_test TAP_TESTS_C+= nearbyint_test TAP_TESTS_C+= next_test TAP_TESTS_C+= rem_test TAP_TESTS_C+= trig_test .if !empty(PROG) && !empty(TAP_TESTS_C:M${PROG}) CFLAGS+= -O0 .endif CSTD= c99 #COPTS+= -Wfloat-equal IGNORE_PRAGMA= LIBADD+= m # Copied from lib/msun/Makefile .if ${MACHINE_CPUARCH} == "i386" ARCH_SUBDIR= i387 .else ARCH_SUBDIR= ${MACHINE_CPUARCH} .endif .include "../${ARCH_SUBDIR}/Makefile.inc" # XXX: for some odd reason float.h doesn't tell the full story about what the # precision is. CFLAGS+= -DLDBL_PREC=${LDBL_PREC} .include .include Index: head/lib/tests/Makefile =================================================================== --- head/lib/tests/Makefile (revision 299093) +++ head/lib/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/atf/atf-check/tests/Makefile =================================================================== --- head/libexec/atf/atf-check/tests/Makefile (revision 299093) +++ head/libexec/atf/atf-check/tests/Makefile (revision 299094) @@ -1,14 +1,8 @@ # $FreeBSD$ -.include - -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh ATF_TESTS_SH= atf-check_test .include Index: head/libexec/atf/atf-sh/tests/Makefile =================================================================== --- head/libexec/atf/atf-sh/tests/Makefile (revision 299093) +++ head/libexec/atf/atf-sh/tests/Makefile (revision 299094) @@ -1,34 +1,28 @@ # $FreeBSD$ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh ATF_TESTS_SH+= atf_check_test ATF_TESTS_SH+= config_test ATF_TESTS_SH+= integration_test ATF_TESTS_SH+= normalize_test ATF_TESTS_SH+= tc_test ATF_TESTS_SH+= tp_test integration_test: Makefile ATF_TESTS_SH_SED_integration_test= \ -e 's,__ATF_SH__,/usr/libexec/atf-sh,g' SCRIPTS+= misc_helpers SCRIPTSDIR_misc_helpers=${TESTSDIR} CLEANFILES+= misc_helpers misc_helpers.tmp misc_helpers: misc_helpers.sh echo '#! /usr/libexec/atf-sh' >${.TARGET}.tmp cat ${.ALLSRC} >>${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .include Index: head/libexec/atf/tests/Makefile =================================================================== --- head/libexec/atf/tests/Makefile (revision 299093) +++ head/libexec/atf/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/rtld-elf/tests/Makefile =================================================================== --- head/libexec/rtld-elf/tests/Makefile (revision 299093) +++ head/libexec/rtld-elf/tests/Makefile (revision 299094) @@ -1,13 +1,8 @@ # $FreeBSD$ -.include - -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} SUBDIR+= libpythagoras target SUBDIR_DEPEND_target= libpythagoras ATF_TESTS_C= ld_library_pathfds .include Index: head/libexec/rtld-elf/tests/libpythagoras/Makefile =================================================================== --- head/libexec/rtld-elf/tests/libpythagoras/Makefile (revision 299093) +++ head/libexec/rtld-elf/tests/libpythagoras/Makefile (revision 299094) @@ -1,19 +1,15 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - LIB= pythagoras SHLIB_MAJOR= 0 LIBDIR= ${TESTSBASE}/libexec/rtld-elf SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf SRCS= pythagoras.c LIBADD= m .include Index: head/libexec/rtld-elf/tests/target/Makefile =================================================================== --- head/libexec/rtld-elf/tests/target/Makefile (revision 299093) +++ head/libexec/rtld-elf/tests/target/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - PROG= target BINDIR= ${TESTSBASE}/libexec/rtld-elf CFLAGS+= -I${.CURDIR}/../libpythagoras LDFLAGS+= -L${.OBJDIR}/../libpythagoras DPADD+= ${.OBJDIR}/../libpythagoras/libpythagoras.a LDADD= -lpythagoras MAN= .include Index: head/libexec/tests/Makefile =================================================================== --- head/libexec/tests/Makefile (revision 299093) +++ head/libexec/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/sbin/devd/tests/Makefile =================================================================== --- head/sbin/devd/tests/Makefile (revision 299093) +++ head/sbin/devd/tests/Makefile (revision 299094) @@ -1,14 +1,10 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_C= client_test TEST_METADATA.client_test= required_programs="devd" TEST_METADATA.client_test+= required_user="root" TEST_METADATA.client_test+= timeout=15 WARNS?= 5 .include Index: head/sbin/dhclient/tests/Makefile =================================================================== --- head/sbin/dhclient/tests/Makefile (revision 299093) +++ head/sbin/dhclient/tests/Makefile (revision 299094) @@ -1,17 +1,13 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR:H} PLAIN_TESTS_C= option-domain-search_test SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \ tables.c fake.c option-domain-search.c CFLAGS.option-domain-search_test+= -I${.CURDIR}/.. LIBADD.option-domain-search_test= util WARNS?= 2 .include Index: head/sbin/growfs/tests/Makefile =================================================================== --- head/sbin/growfs/tests/Makefile (revision 299093) +++ head/sbin/growfs/tests/Makefile (revision 299094) @@ -1,9 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_PERL= legacy_test .include Index: head/sbin/ifconfig/tests/Makefile =================================================================== --- head/sbin/ifconfig/tests/Makefile (revision 299093) +++ head/sbin/ifconfig/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= nonexistent_test .include .include Index: head/sbin/mdconfig/tests/Makefile =================================================================== --- head/sbin/mdconfig/tests/Makefile (revision 299093) +++ head/sbin/mdconfig/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH= mdconfig_test TEST_METADATA.mdconfig_test+= required_user="root" .include Index: head/sbin/tests/Makefile =================================================================== --- head/sbin/tests/Makefile (revision 299093) +++ head/sbin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/lib/tests/Makefile =================================================================== --- head/secure/lib/tests/Makefile (revision 299093) +++ head/secure/lib/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/libexec/tests/Makefile =================================================================== --- head/secure/libexec/tests/Makefile (revision 299093) +++ head/secure/libexec/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/tests/Makefile =================================================================== --- head/secure/tests/Makefile (revision 299093) +++ head/secure/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.bin/tests/Makefile =================================================================== --- head/secure/usr.bin/tests/Makefile (revision 299093) +++ head/secure/usr.bin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.sbin/tests/Makefile =================================================================== --- head/secure/usr.sbin/tests/Makefile (revision 299093) +++ head/secure/usr.sbin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/share/examples/tests/Makefile =================================================================== --- head/share/examples/tests/Makefile (revision 299093) +++ head/share/examples/tests/Makefile (revision 299094) @@ -1,16 +1,8 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - SUBDIR= tests .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/share/examples/tests/tests/Makefile =================================================================== --- head/share/examples/tests/tests/Makefile (revision 299093) +++ head/share/examples/tests/tests/Makefile (revision 299094) @@ -1,32 +1,27 @@ # $FreeBSD$ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} - # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests # List of subdirectories into which we want to recurse during the build # of the system. We use TESTS_SUBDIRS instead of SUBDIR because we want # the auto-generated Kyuafile to recurse into these directories. TESTS_SUBDIRS= atf plain # We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile # for us based on the contents of the TESTS_SUBDIRS line above. The # generated file will tell the tests run-time engine to recurse into the # directories listed above. #KYUAFILE= auto .include Index: head/share/examples/tests/tests/atf/Makefile =================================================================== --- head/share/examples/tests/tests/atf/Makefile (revision 299093) +++ head/share/examples/tests/tests/atf/Makefile (revision 299094) @@ -1,36 +1,51 @@ # $FreeBSD$ .include -FILESGROUPS= FILES +# The release package to use for the tests contained within the directory +# +# This applies to components which rely on ^/projects/release-pkg support +# (see UPDATING XXXXXXXXX / svn revision r298107). PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests/atf # List of test programs to build. Note that we can build more than one # test from a single directory, and this is expected. ATF_TESTS_C= printf_test ATF_TESTS_SH= cp_test # Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this # directory. We do so because the file in this directory exists for # documentation purposes. # # In general, however, you should NOT define KYUAFILE at all to allow # bsd.test.mk auto-generate one for you based on the ATF_TESTS_* # definitions from above. KYUAFILE= yes + +# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional +# ${PACKAGE} namespace of files. +# +# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the +# installation of the files can be manipulated via ${PACKAGE}FILESDIR, +# ${PACKAGE}FILESMODE, etc. +# +# Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE} +# namespace if release package support isn't needed. +${PACKAGE}FILES+= file1 +CLEANFILES+= file1 + +file1: + @echo "File 1" > ${.TARGET} .include Index: head/share/examples/tests/tests/atf/cp_test.sh =================================================================== --- head/share/examples/tests/tests/atf/cp_test.sh (revision 299093) +++ head/share/examples/tests/tests/atf/cp_test.sh (revision 299094) @@ -1,119 +1,119 @@ # $FreeBSD$ # # Copyright 2013 Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # * Neither the name of Google Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # INTRODUCTION # # This sample test program implements various test cases for the cp(1) # utility in order to demonstrate the usage of the ATF shell API (see # atf-sh-api(3)). # # # Auxiliary function to compare two files for equality. # verify_copy() { if ! cmp -s "${1}" "${2}"; then echo "${1} and ${2} differ, but they should be equal" diff -u "${1}" "${2}" atf_fail "Original and copy do not match" fi } # # This is the simplest form of a test case definition: a test case # without a header. # # In most cases, this is the definition you will want to use. However, # make absolutely sure that the test case name is descriptive enough. # Multi-word test case names are encouraged. Keep in mind that these # are exposed to the reader in the test reports, and the goal is for # the combination of the test program plus the name of the test case to # give a pretty clear idea of what specific condition the test is # validating. # atf_test_case simple simple_body() { - echo 'File 1' >file1 + cp $(atf_get_srcdir)/file1 . # The atf_check function is a very powerful function of atf-sh. # It allows you to define checkers for the exit status, the # stdout and the stderr of any command you execute. If the # result of the command does not match the expectations defined # in the checkers, the test fails and verbosely reports data # behind the problem. # # See atf-check(1) for details. atf_check -s exit:0 -o empty -e empty cp file1 file2 verify_copy file1 file2 # Of special note here is that we are NOT deleting the temporary # files we created in this test. Kyua takes care of this # cleanup automatically and tests can (and should) rely on this # behavior. } # # This is a more complex form of a test case definition: a test case # with a header and a body. You should always favor the simpler # definition above unless you have to override specific metadata # variables. # # See atf-test-case(4) and kyua-atf-interface(1) for details on all # available properties. # atf_test_case force force_head() { # In this specific case, we define a textual description for # the test case, which is later exported to the reports for # documentation purposes. # # However, note again that you should favor highly descriptive # test case names to textual descriptions. atf_set "descr" "Tests that the -f flag causes cp to forcibly" \ "override the destination file" } force_body() { - echo 'File 1' >file1 + cp $(atf_get_srcdir)/file1 . echo 'File 2' >file2 chmod 400 file2 atf_check cp -f file1 file2 verify_copy file1 file2 } # # Lastly, we tell ATF which test cases exist in this program. This # function should not do anything other than this registration. # atf_init_test_cases() { atf_add_test_case simple atf_add_test_case force } Index: head/share/examples/tests/tests/plain/Makefile =================================================================== --- head/share/examples/tests/tests/plain/Makefile (revision 299093) +++ head/share/examples/tests/tests/plain/Makefile (revision 299094) @@ -1,36 +1,51 @@ # $FreeBSD$ .include -FILESGROUPS= FILES +# The release package to use for the tests contained within the directory +# +# This applies to components which rely on ^/projects/release-pkg support +# (see UPDATING XXXXXXXXX / svn revision r298107). PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests/plain # List of test programs to build. Note that we can build more than one # test from a single directory, and this is expected. PLAIN_TESTS_C= printf_test PLAIN_TESTS_SH= cp_test # Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this # directory. We do so because the file in this directory exists for # documentation purposes. # # In general, however, you should NOT define KYUAFILE at all to allow # bsd.test.mk auto-generate one for you based on the PLAIN_TESTS_* # definitions from above. KYUAFILE= yes + +# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional +# ${PACKAGE} namespace of files. +# +# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the +# installation of the files can be manipulated via ${PACKAGE}FILESDIR, +# ${PACKAGE}FILESMODE, etc. +# +# Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE} +# namespace if release package support isn't needed. +${PACKAGE}FILES+= file1 +CLEANFILES+= file1 + +file1: + @echo "File 1" > ${.TARGET} .include Index: head/share/examples/tests/tests/plain/cp_test.sh =================================================================== --- head/share/examples/tests/tests/plain/cp_test.sh (revision 299093) +++ head/share/examples/tests/tests/plain/cp_test.sh (revision 299094) @@ -1,85 +1,84 @@ #! /bin/sh # $FreeBSD$ # # Copyright 2013 Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # * Neither the name of Google Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # INTRODUCTION # # This plain test program mimics the structure and contents of its # ATF-based counterpart. It attempts to represent various test cases # in different separate functions and just calls them all from main. # # In reality, plain test programs can be much simpler. All they have # to do is return 0 on success and non-0 otherwise. # set -e # Prints an error message and exits. err() { echo "${@}" 1>&2 exit 1 } # Auxiliary function to compare two files for equality. verify_copy() { if ! cmp -s "${1}" "${2}"; then diff -u "${1}" "${2}" err "${1} and ${2} differ, but they should be equal" fi } simple_test() { - echo 'File 1' >file1 + cp "$(dirname "${0}")/file1" . cp file1 file2 || err "cp failed" verify_copy file1 file2 } force_test() { - echo 'File 1' >file1 - echo 'File 2' >file2 - chmod 400 file2 - cp -f file1 file2 || err "cp failed" - verify_copy file1 file2 + echo 'File 3' >file3 + chmod 400 file3 + cp -f file1 file3 || err "cp failed" + verify_copy file1 file3 } # If you have read the cp_test.sh counterpart in the atf/ directory, you # may think that the sequencing of tests below and the exposed behavior # to the user is very similar. But you'd be wrong. # # There are two major differences with this and the ATF version. The # first is that the code below has no provisions to detect failures in # one test and continue running the other tests: the first failure # causes the whole test program to exit. The second is that this # particular "main" has no arguments: without ATF, all test programs may # expose a different command-line interface, and this is an issue for # consistency purposes. simple_test force_test Index: head/share/mk/bsd.test.mk =================================================================== --- head/share/mk/bsd.test.mk (revision 299093) +++ head/share/mk/bsd.test.mk (revision 299094) @@ -1,93 +1,98 @@ # $FreeBSD$ # # Generic build infrastructure for test programs. # # This is the only public file that should be included by Makefiles when # tests are to be built. All other *.test.mk files are internal and not # to be included directly. .include ____: # Third-party software (kyua, etc) prefix. LOCALBASE?= /usr/local # Tests install directory TESTSDIR?= ${TESTSBASE}/${RELDIR:H} -PACKAGE= tests + +PACKAGE?= tests + +FILESGROUPS+= ${PACKAGE}FILES +${PACKAGE}FILESPACKAGE= ${PACKAGE} +${PACKAGE}FILESDIR= ${TESTSDIR} # List of subdirectories containing tests into which to recurse. This has the # same semantics as SUBDIR at build-time. However, the directories listed here # get registered into the run-time test suite definitions so that the test # engines know to recurse into these directories. # # In other words: list here any directories that contain test programs but use # SUBDIR for directories that may contain helper binaries and/or data files. TESTS_SUBDIRS?= # If defined, indicates that the tests built by the Makefile are not part of # the FreeBSD Test Suite. The implication of this is that the tests won't be # installed under /usr/tests/ and that Kyua won't be able to run them. #NOT_FOR_TEST_SUITE= # List of variables to pass to the tests at run-time via the environment. TESTS_ENV?= # Force all tests in a separate distribution file. # # We want this to be the case even when the distribution name is already # overriden. For example: we want the tests for programs in the 'games' # distribution to end up in the 'tests' distribution; the test programs # themselves have all the necessary logic to detect that the games are not # installed and thus won't cause false negatives. DISTRIBUTION:= tests # Ordered list of directories to construct the PATH for the tests. TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \ ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g} # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests. TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} # List of all tests being built. The various *.test.mk modules extend this # variable as needed. _TESTS= # Pull in the definitions of all supported test interfaces. .include .include .include # kyua automatically descends directories; only run make check on the # top-level directory .if !make(check) .for ts in ${TESTS_SUBDIRS} .if empty(SUBDIR:M${ts}) SUBDIR+= ${ts} .endif .endfor SUBDIR_PARALLEL= t .endif # it is rare for test cases to have man pages .if !defined(MAN) MAN= .endif .if !defined(NOT_FOR_TEST_SUITE) .include .endif .if !target(realcheck) realcheck: .PHONY @echo "$@ not defined; skipping" .endif beforecheck realcheck aftercheck check: .PHONY .ORDER: beforecheck realcheck aftercheck check: beforecheck realcheck aftercheck .include Index: head/share/mk/suite.test.mk =================================================================== --- head/share/mk/suite.test.mk (revision 299093) +++ head/share/mk/suite.test.mk (revision 299094) @@ -1,102 +1,102 @@ # $FreeBSD$ # # You must include bsd.test.mk instead of this file from your Makefile. # # Internal glue for the build of /usr/tests/. .if !target(____) .error suite.test.mk cannot be included directly. .endif # Name of the test suite these tests belong to. Should rarely be changed for # Makefiles built into the FreeBSD src tree. TESTSUITE?= FreeBSD # Knob to control the handling of the Kyuafile for this Makefile. # # If 'yes', a Kyuafile exists in the source tree and is installed into # TESTSDIR. # # If 'auto', a Kyuafile is automatically generated based on the list of test # programs built by the Makefile and is installed into TESTSDIR. This is the # default and is sufficient in the majority of the cases. # # If 'no', no Kyuafile is installed. KYUAFILE?= auto # Per-test program interface definition. # # The name provided here must match one of the interface names supported by # Kyua as this is later encoded in the Kyuafile test program definitions. #TEST_INTERFACE.= interface-name # Metadata properties applicable to all test programs. # # All the variables for a test program defined in the Makefile are appended # to the test program's definition in the Kyuafile. This feature can be # used to avoid having to explicitly supply a Kyuafile in the source # directory, allowing the caller Makefile to rely on the KYUAFILE=auto # behavior defined here. #TEST_METADATA+= key="value" # Per-test program metadata properties as a list of key/value pairs. # # These per-test program settings _extend_ the values provided in the # unqualified TEST_METADATA variable. #TEST_METADATA.+= key="value" .if ${KYUAFILE:tl} != "no" -FILES+= Kyuafile -FILESDIR_Kyuafile= ${TESTSDIR} +${PACKAGE}FILES+= Kyuafile +${PACKAGE}FILESDIR_Kyuafile= ${TESTSDIR} .endif .for _T in ${_TESTS} _TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}} .endfor .if ${KYUAFILE:tl} == "auto" CLEANFILES+= Kyuafile Kyuafile.tmp Kyuafile: Makefile @{ \ echo '-- Automatically generated by bsd.test.mk.'; \ echo; \ echo 'syntax(2)'; \ echo; \ echo 'test_suite("${TESTSUITE}")'; \ echo; \ } > ${.TARGET}.tmp .for _T in ${_TESTS} @echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${_TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \ >>${.TARGET}.tmp .endfor .for _T in ${TESTS_SUBDIRS:N.WAIT} @echo "include(\"${_T}/${.TARGET}\")" >>${.TARGET}.tmp .endfor @mv ${.TARGET}.tmp ${.TARGET} .endif CHECKDIR?= ${DESTDIR}${TESTSDIR} KYUA= ${LOCALBASE}/bin/kyua # Definition of the "make check" target and supporting variables. # # This target, by necessity, can only work for native builds (i.e. a FreeBSD # host building a release for the same system). The target runs Kyua, which is # not in the toolchain, and the tests execute code built for the target host. # # Due to the dependencies of the binaries built by the source tree and how they # are used by tests, it is highly possible for a execution of "make test" to # report bogus results unless the new binaries are put in place. realcheck: .PHONY @if [ ! -x ${KYUA} ]; then \ echo; \ echo "kyua binary not installed at expected location (${.TARGET})"; \ echo; \ echo "Please install via pkg install, or specify the path to the kyua"; \ echo "package via the \$${LOCALBASE} variable, e.g. "; \ echo "LOCALBASE=\"${LOCALBASE}\""; \ false; \ fi @${KYUA} test -k ${CHECKDIR}/Kyuafile Index: head/share/tests/Makefile =================================================================== --- head/share/tests/Makefile (revision 299093) +++ head/share/tests/Makefile (revision 299094) @@ -1,15 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile -TESTSDIR= ${TESTSBASE}/share - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/sys/modules/tests/callout_test/Makefile =================================================================== --- head/sys/modules/tests/callout_test/Makefile (revision 299093) +++ head/sys/modules/tests/callout_test/Makefile (revision 299094) @@ -1,19 +1,15 @@ # # $FreeBSD$ # -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - .PATH: ${.CURDIR}/../../../tests/callout_test KMOD= callout_test SRCS= callout_test.c # # Enable full debugging # #CFLAGS += -g .include Index: head/sys/modules/tests/framework/Makefile =================================================================== --- head/sys/modules/tests/framework/Makefile (revision 299093) +++ head/sys/modules/tests/framework/Makefile (revision 299094) @@ -1,20 +1,16 @@ # # $FreeBSD$ # -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - .PATH: ${.CURDIR}/../../../tests/framework KMOD= kern_testfrwk SRCS= kern_testfrwk.c SRCS+= bus_if.h device_if.h # # Enable full debugging # #CFLAGS += -g .include Index: head/tests/Makefile =================================================================== --- head/tests/Makefile (revision 299093) +++ head/tests/Makefile (revision 299094) @@ -1,25 +1,20 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile -SUBDIR+= etc -SUBDIR+= sys -SUBDIR_PARALLEL= - TESTSDIR= ${TESTSBASE} + +${PACKAGE}FILES+= README + KYUAFILE= yes -FILES+= README -FILESDIR_README= ${TESTSDIR} +SUBDIR+= etc +SUBDIR+= sys + +SUBDIR_PARALLEL= afterinstall: install-tests-local install-tests-local: .PHONY ${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local .include Index: head/tests/etc/Makefile =================================================================== --- head/tests/etc/Makefile (revision 299093) +++ head/tests/etc/Makefile (revision 299094) @@ -1,18 +1,12 @@ # $FreeBSD$ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - TESTSDIR= ${TESTSBASE}/etc .PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR+= rc.d .include Index: head/tests/etc/rc.d/Makefile =================================================================== --- head/tests/etc/rc.d/Makefile (revision 299093) +++ head/tests/etc/rc.d/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/etc/rc.d ATF_TESTS_SH+= routing_test .include Index: head/tests/sys/Makefile =================================================================== --- head/tests/sys/Makefile (revision 299093) +++ head/tests/sys/Makefile (revision 299094) @@ -1,29 +1,24 @@ # $FreeBSD$ -.include - -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= aio TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= geom TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mac TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= posixshm TESTS_SUBDIRS+= sys TESTS_SUBDIRS+= vfs TESTS_SUBDIRS+= vm # Items not integrated into kyua runs by default SUBDIR+= pjdfstest .include Index: head/tests/sys/acl/Makefile =================================================================== --- head/tests/sys/acl/Makefile (revision 299093) +++ head/tests/sys/acl/Makefile (revision 299094) @@ -1,38 +1,37 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/acl BINDIR= ${TESTSDIR} -FILES+= tools-crossfs.test -FILES+= tools-nfs4.test -FILES+= tools-nfs4-psarc.test -FILES+= tools-nfs4-trivial.test -FILES+= tools-posix.test +${PACKAGE}FILES+= tools-crossfs.test +${PACKAGE}FILES+= tools-nfs4.test +${PACKAGE}FILES+= tools-nfs4-psarc.test +${PACKAGE}FILES+= tools-nfs4-trivial.test +${PACKAGE}FILES+= tools-posix.test SCRIPTS+= run TAP_TESTS_SH+= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor _ACL_PROGS= getfacl setfacl .for t in 01 03 04 TEST_METADATA.$t+= required_programs="zpool ${_ACL_PROGS}" .endfor .for t in 00 02 TEST_METADATA.$t+= required_programs="${_ACL_PROGS}" .endfor .include Index: head/tests/sys/aio/Makefile =================================================================== --- head/tests/sys/aio/Makefile (revision 299093) +++ head/tests/sys/aio/Makefile (revision 299094) @@ -1,18 +1,16 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/aio +ATF_TESTS_C+= aio_test + PLAIN_TESTS_C+= aio_kqueue_test PLAIN_TESTS_C+= lio_kqueue_test -ATF_TESTS_C+= aio_test LIBADD.aio_test+= util CFLAGS+= -I${.CURDIR:H:H} WARNS?= 6 .include Index: head/tests/sys/fifo/Makefile =================================================================== --- head/tests/sys/fifo/Makefile (revision 299093) +++ head/tests/sys/fifo/Makefile (revision 299094) @@ -1,16 +1,13 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/fifo PLAIN_TESTS_C+= fifo_create PLAIN_TESTS_C+= fifo_io PLAIN_TESTS_C+= fifo_misc PLAIN_TESTS_C+= fifo_open TEST_METADATA.fifo_create+= required_user="root" TEST_METADATA.fifo_open+= required_user="root" .include Index: head/tests/sys/file/Makefile =================================================================== --- head/tests/sys/file/Makefile (revision 299093) +++ head/tests/sys/file/Makefile (revision 299094) @@ -1,25 +1,22 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/file BINDIR= ${TESTSDIR} TAP_TESTS_C+= closefrom_test TAP_TESTS_C+= dup_test TAP_TESTS_C+= fcntlflags_test TAP_TESTS_SH+= flock_test PLAIN_TESTS_C+= ftruncate_test PLAIN_TESTS_C+= newfileops_on_fork_test PROGS+= flock_helper LIBADD.closefrom_test= util LIBADD.flock_helper= pthread LIBADD.newfileops_on_fork_test= pthread .include Index: head/tests/sys/geom/Makefile =================================================================== --- head/tests/sys/geom/Makefile (revision 299093) +++ head/tests/sys/geom/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/geom TESTS_SUBDIRS+= class .include Index: head/tests/sys/geom/class/Makefile =================================================================== --- head/tests/sys/geom/class/Makefile (revision 299093) +++ head/tests/sys/geom/class/Makefile (revision 299094) @@ -1,24 +1,21 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class TESTS_SUBDIRS+= concat TESTS_SUBDIRS+= eli TESTS_SUBDIRS+= gate # XXX: might not work due to geom(4) changes; more investigation's needed #TESTS_SUBDIRS+= gpt TESTS_SUBDIRS+= mirror TESTS_SUBDIRS+= nop TESTS_SUBDIRS+= raid3 TESTS_SUBDIRS+= shsec TESTS_SUBDIRS+= stripe TESTS_SUBDIRS+= uzip -BINDIR= ${TESTSDIR} - -FILES+= geom_subr.sh +${PACKAGE}FILES+= geom_subr.sh .include Index: head/tests/sys/geom/class/concat/Makefile =================================================================== --- head/tests/sys/geom/class/concat/Makefile (revision 299093) +++ head/tests/sys/geom/class/concat/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/eli/Makefile =================================================================== --- head/tests/sys/geom/class/eli/Makefile (revision 299093) +++ head/tests/sys/geom/class/eli/Makefile (revision 299094) @@ -1,46 +1,42 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= attach_d_test TAP_TESTS_SH+= configure_b_B_test TAP_TESTS_SH+= delkey_test TAP_TESTS_SH+= detach_l_test TAP_TESTS_SH+= init_B_test TAP_TESTS_SH+= init_J_test TAP_TESTS_SH+= init_a_test TAP_TESTS_SH+= init_i_P_test TAP_TESTS_SH+= init_test TAP_TESTS_SH+= integrity_copy_test TAP_TESTS_SH+= integrity_data_test TAP_TESTS_SH+= integrity_hmac_test TAP_TESTS_SH+= kill_test TAP_TESTS_SH+= nokey_test TAP_TESTS_SH+= onetime_a_test TAP_TESTS_SH+= onetime_d_test TAP_TESTS_SH+= onetime_test TAP_TESTS_SH+= readonly_test TAP_TESTS_SH+= resize_test TAP_TESTS_SH+= setkey_test TEST_METADATA.init_a_test+= timeout="1200" TEST_METADATA.init_test+= timeout="300" TEST_METADATA.integrity_copy_test+= timeout="1200" TEST_METADATA.integrity_data_test+= timeout="600" TEST_METADATA.integrity_hmac_test+= timeout="600" TEST_METADATA.onetime_a_test+= timeout="600" TEST_METADATA.onetime_test+= timeout="600" -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/gate/Makefile =================================================================== --- head/tests/sys/geom/class/gate/Makefile (revision 299093) +++ head/tests/sys/geom/class/gate/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test TAP_TESTS_SH+= 3_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/mirror/Makefile =================================================================== --- head/tests/sys/geom/class/mirror/Makefile (revision 299093) +++ head/tests/sys/geom/class/mirror/Makefile (revision 299094) @@ -1,25 +1,21 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test TAP_TESTS_SH+= 3_test TAP_TESTS_SH+= 4_test TAP_TESTS_SH+= 5_test TAP_TESTS_SH+= 6_test TAP_TESTS_SH+= 7_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/nop/Makefile =================================================================== --- head/tests/sys/geom/class/nop/Makefile (revision 299093) +++ head/tests/sys/geom/class/nop/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/raid3/Makefile =================================================================== --- head/tests/sys/geom/class/raid3/Makefile (revision 299093) +++ head/tests/sys/geom/class/raid3/Makefile (revision 299094) @@ -1,30 +1,26 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test TAP_TESTS_SH+= 3_test TAP_TESTS_SH+= 4_test TAP_TESTS_SH+= 5_test TAP_TESTS_SH+= 6_test TAP_TESTS_SH+= 7_test TAP_TESTS_SH+= 8_test TAP_TESTS_SH+= 9_test TAP_TESTS_SH+= 10_test TAP_TESTS_SH+= 11_test TAP_TESTS_SH+= 12_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/shsec/Makefile =================================================================== --- head/tests/sys/geom/class/shsec/Makefile (revision 299093) +++ head/tests/sys/geom/class/shsec/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/stripe/Makefile =================================================================== --- head/tests/sys/geom/class/stripe/Makefile (revision 299093) +++ head/tests/sys/geom/class/stripe/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -TESTS+= ${FILES} TAP_TESTS_SH+= 1_test TAP_TESTS_SH+= 2_test -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/geom/class/uzip/Makefile =================================================================== --- head/tests/sys/geom/class/uzip/Makefile (revision 299093) +++ head/tests/sys/geom/class/uzip/Makefile (revision 299094) @@ -1,47 +1,42 @@ # # $FreeBSD$ # # Regression test for geom_uzip. # PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} IMAGE= 1.img ZIMAGE= ${IMAGE}.uzip UZIMAGE= ${ZIMAGE}.uue CLEANFILES+= ${IMAGE} ${UZIMAGE} ${ZIMAGE} ${IMAGE}: makefs -s 1048576 ${.TARGET} ${.CURDIR}/etalon ${ZIMAGE}: ${IMAGE} mkuzip -o ${.TARGET} ${.ALLSRC} ${UZIMAGE}: ${IMAGE} ${ZIMAGE} printf "#\n# $$" >${.TARGET} printf "FreeBSD$$\n#\n\n" >> ${.TARGET} uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET} -FILES+= conf.sh -FILESNAME_conf.sh= conf.sh +${PACKAGE}FILES+= conf.sh \ + ${UZIMAGE} -FILES+= ${UZIMAGE} -FILESDIR= ${TESTSDIR} - -FILESGROUPS+= FILES etalon +FILESGROUPS+= etalon etalon+= etalon/etalon.txt etalonDIR= ${TESTSDIR}/etalon -FILESPACKAGE= ${PACKAGE} etalonPACKAGE= ${PACKAGE} TAP_TESTS_SH+= 1_test .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/tests/sys/kern/Makefile =================================================================== --- head/tests/sys/kern/Makefile (revision 299093) +++ head/tests/sys/kern/Makefile (revision 299094) @@ -1,44 +1,41 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel .PATH: ${SRCTOP}/sys/kern TESTSDIR= ${TESTSBASE}/sys/kern ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test ATF_TESTS_C+= ptrace_test PLAIN_TESTS_C+= subr_unit_test ATF_TESTS_C+= unix_seqpacket_test ATF_TESTS_C+= unix_passfd_test TEST_METADATA.unix_seqpacket_test+= timeout="15" LIBADD.ptrace_test+= pthread LIBADD.unix_seqpacket_test+= pthread NETBSD_ATF_TESTS_C+= lockf_test NETBSD_ATF_TESTS_C+= mqueue_test CFLAGS.mqueue_test+= -I${SRCTOP}/tests LIBADD.mqueue_test+= rt # subr_unit.c contains functions whose prototypes lie in headers that cannot be # included in userland. But as far as subr_unit_test goes, they're effectively # static. So it's ok to disable -Wmissing-prototypes for this program. CFLAGS.subr_unit.c+= -Wno-missing-prototypes # XXX: -Wno-sign-compare will be eliminated as part of D6004 CFLAGS.subr_unit.c+= -Wno-sign-compare SRCS.subr_unit_test+= subr_unit.c WARNS?= 5 TESTS_SUBDIRS+= acct TESTS_SUBDIRS+= execve TESTS_SUBDIRS+= pipe .include .include Index: head/tests/sys/kern/acct/Makefile =================================================================== --- head/tests/sys/kern/acct/Makefile (revision 299093) +++ head/tests/sys/kern/acct/Makefile (revision 299094) @@ -1,22 +1,19 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/kern/acct ATF_TESTS_C= acct_test CFLAGS+= -I${.OBJDIR} CLEANFILES+= convert.c convert.c.tmp DPSRCS.acct_test= convert.c acct_test.o: convert.c convert.c: ${SRCTOP}/sys/kern/kern_acct.c sed -n -e 's/log(/syslog(/g' \ -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' ${.ALLSRC} >${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .include Index: head/tests/sys/kern/execve/Makefile =================================================================== --- head/tests/sys/kern/execve/Makefile (revision 299093) +++ head/tests/sys/kern/execve/Makefile (revision 299094) @@ -1,42 +1,39 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/kern/execve BINDIR= ${TESTSDIR} MAN= ATF_TESTS_SH+= execve_test PROGS+= good_aout PROGS+= execve_helper LDFLAGS.goodaout+= -static CLEANFILES+= empty CLEANFILES+= sparse_aout CLEANFILES+= trunc_aout SCRIPTS+= bad_interp_len SCRIPTS+= dev_null_script SCRIPTS+= empty SCRIPTS+= good_script SCRIPTS+= non_exist_shell SCRIPTS+= script_arg SCRIPTS+= script_arg_nospace SCRIPTS+= sparse_aout SCRIPTS+= trunc_aout empty: @touch $@ sparse_aout: @truncate -s 20480 $@ trunc_aout: @truncate -s 16 $@ .include Index: head/tests/sys/kern/pipe/Makefile =================================================================== --- head/tests/sys/kern/pipe/Makefile (revision 299093) +++ head/tests/sys/kern/pipe/Makefile (revision 299094) @@ -1,19 +1,16 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/kern/pipe PLAIN_TESTS_C+= big_pipe_test PLAIN_TESTS_C+= pipe_fstat_bug_test PLAIN_TESTS_C+= pipe_ino_test PLAIN_TESTS_C+= pipe_overcommit1_test PLAIN_TESTS_C+= pipe_overcommit2_test PLAIN_TESTS_C+= pipe_reverse2_test PLAIN_TESTS_C+= pipe_reverse_test PLAIN_TESTS_C+= pipe_wraparound_test WARNS?= 6 .include Index: head/tests/sys/kqueue/Makefile =================================================================== --- head/tests/sys/kqueue/Makefile (revision 299093) +++ head/tests/sys/kqueue/Makefile (revision 299094) @@ -1,29 +1,26 @@ # $FreeBSD$ # # svn://mark.heily.com/libkqueue/trunk/test # Last update: r114 # # libkqueue and test suite by Mark Heily # -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= kqueue_test TESTSDIR= ${TESTSBASE}/sys/kqueue BINDIR= ${TESTSDIR} PROGS= kqtest SRCS.kqtest= \ main.c \ read.c \ timer.c \ vnode.c \ proc.c \ signal.c \ user.c WARNS?= 2 .include Index: head/tests/sys/mac/Makefile =================================================================== --- head/tests/sys/mac/Makefile (revision 299093) +++ head/tests/sys/mac/Makefile (revision 299094) @@ -1,11 +1,8 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/mac TESTS_SUBDIRS+= bsdextended TESTS_SUBDIRS+= portacl .include Index: head/tests/sys/mac/bsdextended/Makefile =================================================================== --- head/tests/sys/mac/bsdextended/Makefile (revision 299093) +++ head/tests/sys/mac/bsdextended/Makefile (revision 299094) @@ -1,16 +1,13 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/mac/bsdextended TAP_TESTS_C+= ugidfw_test TAP_TESTS_SH+= matches_test LIBADD.ugidfw_test+= ugidfw TEST_METADATA.matches_test+= required_user="root" TEST_METADATA.ugidfw_test+= required_user="root" .include Index: head/tests/sys/mac/portacl/Makefile =================================================================== --- head/tests/sys/mac/portacl/Makefile (revision 299093) +++ head/tests/sys/mac/portacl/Makefile (revision 299094) @@ -1,19 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/mac/portacl -BINDIR= ${TESTSDIR} -FILES+= misc.sh +${PACKAGE}FILES+= misc.sh TAP_TESTS_SH+= nobody_test TAP_TESTS_SH+= root_test .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_user="root" TEST_METADATA.$t+= timeout="450" .endfor .include Index: head/tests/sys/mqueue/Makefile =================================================================== --- head/tests/sys/mqueue/Makefile (revision 299093) +++ head/tests/sys/mqueue/Makefile (revision 299094) @@ -1,24 +1,21 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 #PROGS+= mqtest3 #PROGS+= mqtest4 PROGS+= mqtest5 LIBADD+= rt WARNS?= 6 .include Index: head/tests/sys/netinet/Makefile =================================================================== --- head/tests/sys/netinet/Makefile (revision 299093) +++ head/tests/sys/netinet/Makefile (revision 299094) @@ -1,14 +1,14 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/sys/netinet BINDIR= ${TESTSDIR} ATF_TESTS_SH= fibs_test + PROGS= udp_dontroute + MAN= + WARNS?= 6 .include Index: head/tests/sys/opencrypto/Makefile =================================================================== --- head/tests/sys/opencrypto/Makefile (revision 299093) +++ head/tests/sys/opencrypto/Makefile (revision 299094) @@ -1,17 +1,15 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/opencrypto BINDIR= ${TESTSDIR} PLAIN_TESTS_SH= runtests TEST_METADATA.foo+=required_programs="python" PYMODULES= cryptodev.py cryptodevh.py cryptotest.py dpkt.py -FILESDIR= ${TESTSDIR} -FILES= ${PYMODULES} +${PACKAGE}FILES+= ${PYMODULES} .include Index: head/tests/sys/pjdfstest/Makefile =================================================================== --- head/tests/sys/pjdfstest/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/Makefile (revision 299094) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + SUBDIR+= pjdfstest SUBDIR+= tests + SUBDIR_PARALLEL= .include Index: head/tests/sys/pjdfstest/pjdfstest/Makefile =================================================================== --- head/tests/sys/pjdfstest/pjdfstest/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/pjdfstest/Makefile (revision 299094) @@ -1,23 +1,20 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} -TOP= ${.CURDIR:H:H:H:H} -.PATH: ${TOP}/contrib/pjdfstest +.PATH: ${SRCTOP}/contrib/pjdfstest BINDIR= ${TESTSBASE}/sys/pjdfstest PROG= pjdfstest MAN= CFLAGS+= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT CFLAGS+= -DHAS_CONNECTAT # XXX: the upstream sources need some massaging with how it assigns ngroups in # pjdfstest.c NO_WERROR= WARNS?= 6 .include Index: head/tests/sys/pjdfstest/tests/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/Makefile (revision 299094) @@ -1,42 +1,39 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest TESTSDIR= ${TESTSBASE}/sys/pjdfstest .PATH: ${.CURDIR} -FILESDIR= ${TESTSDIR} -FILES= conf -FILES+= misc.sh +${PACKAGE}FILES+= conf +${PACKAGE}FILES+= misc.sh CLEANFILES+= misc.sh misc.sh.tmp misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh sed -e '\,maindir=,s,maindir=.*,maindir=`dirname $$0`/../,' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} afterinstall: install-tests-symlink install-tests-symlink: .PHONY rm -f ${DESTDIR}${TESTSDIR}/tests ${INSTALL_SYMLINK} . ${DESTDIR}${TESTSDIR}/tests TESTS_SUBDIRS= chflags TESTS_SUBDIRS+= chmod TESTS_SUBDIRS+= chown TESTS_SUBDIRS+= ftruncate TESTS_SUBDIRS+= granular TESTS_SUBDIRS+= link TESTS_SUBDIRS+= mkdir TESTS_SUBDIRS+= mkfifo TESTS_SUBDIRS+= mknod TESTS_SUBDIRS+= open TESTS_SUBDIRS+= rename TESTS_SUBDIRS+= rmdir TESTS_SUBDIRS+= symlink TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= unlink .include Index: head/tests/sys/pjdfstest/tests/chflags/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/chflags/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/chflags/Makefile (revision 299094) @@ -1,22 +1,18 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/chmod/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/chmod/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/chmod/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/chown/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/chown/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/chown/Makefile (revision 299094) @@ -1,19 +1,15 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/ftruncate/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/ftruncate/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/ftruncate/Makefile (revision 299094) @@ -1,23 +1,19 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/granular/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/granular/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/granular/Makefile (revision 299094) @@ -1,14 +1,10 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/link/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/link/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/link/Makefile (revision 299094) @@ -1,26 +1,22 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 TAP_TESTS_SH+= 15 TAP_TESTS_SH+= 16 TAP_TESTS_SH+= 17 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/mkdir/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/mkdir/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/mkdir/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/mkfifo/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/mkfifo/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/mkfifo/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/mknod/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/mknod/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/mknod/Makefile (revision 299094) @@ -1,20 +1,16 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/open/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/open/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/open/Makefile (revision 299094) @@ -1,33 +1,29 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 TAP_TESTS_SH+= 15 TAP_TESTS_SH+= 16 TAP_TESTS_SH+= 17 TAP_TESTS_SH+= 18 TAP_TESTS_SH+= 19 TAP_TESTS_SH+= 20 TAP_TESTS_SH+= 21 TAP_TESTS_SH+= 22 TAP_TESTS_SH+= 23 TAP_TESTS_SH+= 24 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/rename/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/rename/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/rename/Makefile (revision 299094) @@ -1,30 +1,26 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 TAP_TESTS_SH+= 15 TAP_TESTS_SH+= 16 TAP_TESTS_SH+= 17 TAP_TESTS_SH+= 18 TAP_TESTS_SH+= 19 TAP_TESTS_SH+= 20 TAP_TESTS_SH+= 21 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/rmdir/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/rmdir/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/rmdir/Makefile (revision 299094) @@ -1,24 +1,20 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 TAP_TESTS_SH+= 15 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/symlink/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/symlink/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/symlink/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/truncate/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/truncate/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/truncate/Makefile (revision 299094) @@ -1,23 +1,19 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 TAP_TESTS_SH+= 14 .include "../pjdfstest.test.mk" Index: head/tests/sys/pjdfstest/tests/unlink/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/unlink/Makefile (revision 299093) +++ head/tests/sys/pjdfstest/tests/unlink/Makefile (revision 299094) @@ -1,22 +1,18 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 TAP_TESTS_SH+= 05 TAP_TESTS_SH+= 06 TAP_TESTS_SH+= 07 TAP_TESTS_SH+= 08 TAP_TESTS_SH+= 09 TAP_TESTS_SH+= 10 TAP_TESTS_SH+= 11 TAP_TESTS_SH+= 12 TAP_TESTS_SH+= 13 .include "../pjdfstest.test.mk" Index: head/tests/sys/posixshm/Makefile =================================================================== --- head/tests/sys/posixshm/Makefile (revision 299093) +++ head/tests/sys/posixshm/Makefile (revision 299094) @@ -1,10 +1,9 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/posixshm ATF_TESTS_C+= posixshm_test .include Index: head/tests/sys/sys/Makefile =================================================================== --- head/tests/sys/sys/Makefile (revision 299093) +++ head/tests/sys/sys/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TESTSDIR= ${TESTSBASE}/sys/sys ATF_TESTS_C= bitstring_test WARNS?= 5 .include Index: head/tests/sys/vfs/Makefile =================================================================== --- head/tests/sys/vfs/Makefile (revision 299093) +++ head/tests/sys/vfs/Makefile (revision 299094) @@ -1,10 +1,9 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/vfs PLAIN_TESTS_SH+= trailing_slash .include Index: head/tests/sys/vm/Makefile =================================================================== --- head/tests/sys/vm/Makefile (revision 299093) +++ head/tests/sys/vm/Makefile (revision 299094) @@ -1,10 +1,9 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/sys/vm ATF_TESTS_C+= mmap_test .include Index: head/usr.bin/apply/tests/Makefile =================================================================== --- head/usr.bin/apply/tests/Makefile (revision 299093) +++ head/usr.bin/apply/tests/Makefile (revision 299094) @@ -1,16 +1,13 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.00.in -FILES+= regress.00.out -FILES+= regress.01.out -FILES+= regress.01.sh -FILES+= regress.sh +${PACKAGE}FILES+= regress.00.in +${PACKAGE}FILES+= regress.00.out +${PACKAGE}FILES+= regress.01.out +${PACKAGE}FILES+= regress.01.sh +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/basename/tests/Makefile =================================================================== --- head/usr.bin/basename/tests/Makefile (revision 299093) +++ head/usr.bin/basename/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= basename_test .include .include Index: head/usr.bin/bmake/tests/Makefile =================================================================== --- head/usr.bin/bmake/tests/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/usr.bin/bmake -FILESDIR= ${TESTSDIR} -FILES= common.sh -FILES+= test-new.mk +${PACKAGE}FILES+= common.sh +${PACKAGE}FILES+= test-new.mk TESTS_SUBDIRS= archives TESTS_SUBDIRS+= basic TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= shell TESTS_SUBDIRS+= suffixes TESTS_SUBDIRS+= syntax TESTS_SUBDIRS+= sysmk TESTS_SUBDIRS+= variables .include Index: head/usr.bin/bmake/tests/archives/Makefile =================================================================== --- head/usr.bin/bmake/tests/archives/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/archives/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives TESTS_SUBDIRS= fmt_44bsd fmt_44bsd_mod fmt_oldbsd .include Index: head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile =================================================================== --- head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile (revision 299094) @@ -1,35 +1,33 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.status.3 -FILES+= expected.status.4 -FILES+= expected.status.5 -FILES+= expected.status.6 -FILES+= expected.status.7 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stderr.3 -FILES+= expected.stderr.4 -FILES+= expected.stderr.5 -FILES+= expected.stderr.6 -FILES+= expected.stderr.7 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= expected.stdout.3 -FILES+= expected.stdout.4 -FILES+= expected.stdout.5 -FILES+= expected.stdout.6 -FILES+= expected.stdout.7 -FILES+= libtest.a +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.status.3 +${PACKAGE}FILES+= expected.status.4 +${PACKAGE}FILES+= expected.status.5 +${PACKAGE}FILES+= expected.status.6 +${PACKAGE}FILES+= expected.status.7 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stderr.3 +${PACKAGE}FILES+= expected.stderr.4 +${PACKAGE}FILES+= expected.stderr.5 +${PACKAGE}FILES+= expected.stderr.6 +${PACKAGE}FILES+= expected.stderr.7 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= expected.stdout.3 +${PACKAGE}FILES+= expected.stdout.4 +${PACKAGE}FILES+= expected.stdout.5 +${PACKAGE}FILES+= expected.stdout.6 +${PACKAGE}FILES+= expected.stdout.7 +${PACKAGE}FILES+= libtest.a .include Index: head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile =================================================================== --- head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile (revision 299094) @@ -1,35 +1,33 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.status.3 -FILES+= expected.status.4 -FILES+= expected.status.5 -FILES+= expected.status.6 -FILES+= expected.status.7 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stderr.3 -FILES+= expected.stderr.4 -FILES+= expected.stderr.5 -FILES+= expected.stderr.6 -FILES+= expected.stderr.7 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= expected.stdout.3 -FILES+= expected.stdout.4 -FILES+= expected.stdout.5 -FILES+= expected.stdout.6 -FILES+= expected.stdout.7 -FILES+= libtest.a +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.status.3 +${PACKAGE}FILES+= expected.status.4 +${PACKAGE}FILES+= expected.status.5 +${PACKAGE}FILES+= expected.status.6 +${PACKAGE}FILES+= expected.status.7 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stderr.3 +${PACKAGE}FILES+= expected.stderr.4 +${PACKAGE}FILES+= expected.stderr.5 +${PACKAGE}FILES+= expected.stderr.6 +${PACKAGE}FILES+= expected.stderr.7 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= expected.stdout.3 +${PACKAGE}FILES+= expected.stdout.4 +${PACKAGE}FILES+= expected.stdout.5 +${PACKAGE}FILES+= expected.stdout.6 +${PACKAGE}FILES+= expected.stdout.7 +${PACKAGE}FILES+= libtest.a .include Index: head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile =================================================================== --- head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile (revision 299094) @@ -1,35 +1,32 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.status.3 -FILES+= expected.status.4 -FILES+= expected.status.5 -FILES+= expected.status.6 -FILES+= expected.status.7 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stderr.3 -FILES+= expected.stderr.4 -FILES+= expected.stderr.5 -FILES+= expected.stderr.6 -FILES+= expected.stderr.7 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= expected.stdout.3 -FILES+= expected.stdout.4 -FILES+= expected.stdout.5 -FILES+= expected.stdout.6 -FILES+= expected.stdout.7 -FILES+= libtest.a +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.status.3 +${PACKAGE}FILES+= expected.status.4 +${PACKAGE}FILES+= expected.status.5 +${PACKAGE}FILES+= expected.status.6 +${PACKAGE}FILES+= expected.status.7 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stderr.3 +${PACKAGE}FILES+= expected.stderr.4 +${PACKAGE}FILES+= expected.stderr.5 +${PACKAGE}FILES+= expected.stderr.6 +${PACKAGE}FILES+= expected.stderr.7 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= expected.stdout.3 +${PACKAGE}FILES+= expected.stdout.4 +${PACKAGE}FILES+= expected.stdout.5 +${PACKAGE}FILES+= expected.stdout.6 +${PACKAGE}FILES+= expected.stdout.7 +${PACKAGE}FILES+= libtest.a .include Index: head/usr.bin/bmake/tests/basic/Makefile =================================================================== --- head/usr.bin/bmake/tests/basic/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/basic/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic TESTS_SUBDIRS= t0 t1 t2 t3 .include Index: head/usr.bin/bmake/tests/basic/t0/Makefile =================================================================== --- head/usr.bin/bmake/tests/basic/t0/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/basic/t0/Makefile (revision 299094) @@ -1,15 +1,13 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t0 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/basic/t1/Makefile =================================================================== --- head/usr.bin/bmake/tests/basic/t1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/basic/t1/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t1 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/basic/t2/Makefile =================================================================== --- head/usr.bin/bmake/tests/basic/t2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/basic/t2/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t2 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/basic/t3/Makefile =================================================================== --- head/usr.bin/bmake/tests/basic/t3/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/basic/t3/Makefile (revision 299094) @@ -1,15 +1,13 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t3 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/execution/Makefile =================================================================== --- head/usr.bin/bmake/tests/execution/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/execution/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution TESTS_SUBDIRS= ellipsis empty joberr plus .include Index: head/usr.bin/bmake/tests/execution/ellipsis/Makefile =================================================================== --- head/usr.bin/bmake/tests/execution/ellipsis/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/execution/ellipsis/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/execution/empty/Makefile =================================================================== --- head/usr.bin/bmake/tests/execution/empty/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/execution/empty/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/execution/joberr/Makefile =================================================================== --- head/usr.bin/bmake/tests/execution/joberr/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/execution/joberr/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/execution/plus/Makefile =================================================================== --- head/usr.bin/bmake/tests/execution/plus/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/execution/plus/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/shell/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell TESTS_SUBDIRS= builtin meta path path_select replace select .include Index: head/usr.bin/bmake/tests/shell/builtin/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/builtin/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/builtin/Makefile (revision 299094) @@ -1,20 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/builtin TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= sh +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= sh .include Index: head/usr.bin/bmake/tests/shell/meta/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/meta/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/meta/Makefile (revision 299094) @@ -1,20 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/meta TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= sh +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= sh .include Index: head/usr.bin/bmake/tests/shell/path/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/path/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/path/Makefile (revision 299094) @@ -1,20 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= sh +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= sh .include Index: head/usr.bin/bmake/tests/shell/path_select/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/path_select/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/path_select/Makefile (revision 299094) @@ -1,20 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path_select TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= shell +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= shell .include Index: head/usr.bin/bmake/tests/shell/replace/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/replace/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/replace/Makefile (revision 299094) @@ -1,20 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/replace TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= shell +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= shell .include Index: head/usr.bin/bmake/tests/shell/select/Makefile =================================================================== --- head/usr.bin/bmake/tests/shell/select/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/shell/select/Makefile (revision 299094) @@ -1,19 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/select TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 .include Index: head/usr.bin/bmake/tests/suffixes/Makefile =================================================================== --- head/usr.bin/bmake/tests/suffixes/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/suffixes/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes TESTS_SUBDIRS= basic src_wild1 src_wild2 .include Index: head/usr.bin/bmake/tests/suffixes/basic/Makefile =================================================================== --- head/usr.bin/bmake/tests/suffixes/basic/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/suffixes/basic/Makefile (revision 299094) @@ -1,17 +1,15 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/basic TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= TEST1.a -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES= Makefile.test +${PACKAGE}FILES+= TEST1.a +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile =================================================================== --- head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile (revision 299094) @@ -1,18 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= TEST1.a -FILES+= TEST2.a -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= TEST1.a +${PACKAGE}FILES+= TEST2.a +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile =================================================================== --- head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile (revision 299094) @@ -1,18 +1,16 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= TEST1.a -FILES+= TEST2.a -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= TEST1.a +${PACKAGE}FILES+= TEST2.a +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/syntax/Makefile =================================================================== --- head/usr.bin/bmake/tests/syntax/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/syntax/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax TESTS_SUBDIRS= directive-t0 enl funny-targets semi .include Index: head/usr.bin/bmake/tests/syntax/directive-t0/Makefile =================================================================== --- head/usr.bin/bmake/tests/syntax/directive-t0/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/syntax/directive-t0/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/directive-t0 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/syntax/enl/Makefile =================================================================== --- head/usr.bin/bmake/tests/syntax/enl/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/syntax/enl/Makefile (revision 299094) @@ -1,28 +1,26 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/enl TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.status.3 -FILES+= expected.status.4 -FILES+= expected.status.5 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stderr.3 -FILES+= expected.stderr.4 -FILES+= expected.stderr.5 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= expected.stdout.3 -FILES+= expected.stdout.4 -FILES+= expected.stdout.5 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.status.3 +${PACKAGE}FILES+= expected.status.4 +${PACKAGE}FILES+= expected.status.5 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stderr.3 +${PACKAGE}FILES+= expected.stderr.4 +${PACKAGE}FILES+= expected.stderr.5 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= expected.stdout.3 +${PACKAGE}FILES+= expected.stdout.4 +${PACKAGE}FILES+= expected.stdout.5 .include Index: head/usr.bin/bmake/tests/syntax/funny-targets/Makefile =================================================================== --- head/usr.bin/bmake/tests/syntax/funny-targets/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/syntax/funny-targets/Makefile (revision 299094) @@ -1,19 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/funny-targets TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 .include Index: head/usr.bin/bmake/tests/syntax/semi/Makefile =================================================================== --- head/usr.bin/bmake/tests/syntax/semi/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/syntax/semi/Makefile (revision 299094) @@ -1,19 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/semi TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 .include Index: head/usr.bin/bmake/tests/sysmk/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk TESTS_SUBDIRS= t0 t1 t2 .include Index: head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/sysmk/t0/2/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t0/2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t0/2/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2 TESTS_SUBDIRS= 1 .include Index: head/usr.bin/bmake/tests/sysmk/t0/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t0/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t0/Makefile (revision 299094) @@ -1,11 +1,8 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0 TESTS_SUBDIRS= 2 SUBDIR= mk .include Index: head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile (revision 299094) @@ -1,12 +1,11 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk -FILESDIR= ${TESTSDIR} -FILES= sys.mk.test -FILESNAME_sys.mk.test= sys.mk +${PACKAGE}FILES+= sys.mk.test + +${PACKAGE}FILESNAME_sys.mk.test= sys.mk .include Index: head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= cleanup -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= cleanup +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/sysmk/t1/2/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t1/2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t1/2/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2 TESTS_SUBDIRS= 1 .include Index: head/usr.bin/bmake/tests/sysmk/t1/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t1/Makefile (revision 299094) @@ -1,11 +1,8 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1 TESTS_SUBDIRS= 2 SUBDIR= mk .include Index: head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile (revision 299094) @@ -1,12 +1,11 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk -FILESDIR= ${TESTSDIR} -FILES= sys.mk.test -FILESNAME_sys.mk.test= sys.mk +${PACKAGE}FILES+= sys.mk.test + +${PACKAGE}FILESNAME_sys.mk.test= sys.mk .include Index: head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= cleanup -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= cleanup +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/sysmk/t2/2/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t2/2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t2/2/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2 TESTS_SUBDIRS= 1 .include Index: head/usr.bin/bmake/tests/sysmk/t2/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t2/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t2/Makefile (revision 299094) @@ -1,11 +1,8 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2 TESTS_SUBDIRS= 2 SUBDIR= mk .include Index: head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile =================================================================== --- head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile (revision 299094) @@ -1,12 +1,11 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk -FILESDIR= ${TESTSDIR} -FILES= sys.mk.test -FILESNAME_sys.mk.test= sys.mk +${PACKAGE}FILES+= sys.mk.test + +${PACKAGE}FILESNAME_sys.mk.test= sys.mk .include Index: head/usr.bin/bmake/tests/variables/Makefile =================================================================== --- head/usr.bin/bmake/tests/variables/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/variables/Makefile (revision 299094) @@ -1,10 +1,7 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables TESTS_SUBDIRS= modifier_M modifier_t opt_V t0 .include Index: head/usr.bin/bmake/tests/variables/modifier_M/Makefile =================================================================== --- head/usr.bin/bmake/tests/variables/modifier_M/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/variables/modifier_M/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/bmake/tests/variables/modifier_t/Makefile =================================================================== --- head/usr.bin/bmake/tests/variables/modifier_t/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/variables/modifier_t/Makefile (revision 299094) @@ -1,22 +1,20 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.status.3 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stderr.3 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 -FILES+= expected.stdout.3 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.status.3 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stderr.3 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 +${PACKAGE}FILES+= expected.stdout.3 .include Index: head/usr.bin/bmake/tests/variables/opt_V/Makefile =================================================================== --- head/usr.bin/bmake/tests/variables/opt_V/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/variables/opt_V/Makefile (revision 299094) @@ -1,19 +1,17 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.status.2 -FILES+= expected.stderr.1 -FILES+= expected.stderr.2 -FILES+= expected.stdout.1 -FILES+= expected.stdout.2 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.status.2 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stderr.2 +${PACKAGE}FILES+= expected.stdout.1 +${PACKAGE}FILES+= expected.stdout.2 .include Index: head/usr.bin/bmake/tests/variables/t0/Makefile =================================================================== --- head/usr.bin/bmake/tests/variables/t0/Makefile (revision 299093) +++ head/usr.bin/bmake/tests/variables/t0/Makefile (revision 299094) @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0 TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 +${PACKAGE}FILES+= Makefile.test +${PACKAGE}FILES+= expected.status.1 +${PACKAGE}FILES+= expected.stderr.1 +${PACKAGE}FILES+= expected.stdout.1 .include Index: head/usr.bin/calendar/tests/Makefile =================================================================== --- head/usr.bin/calendar/tests/Makefile (revision 299093) +++ head/usr.bin/calendar/tests/Makefile (revision 299094) @@ -1,40 +1,38 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= calendar.calibrate -FILES+= regress.a1.out -FILES+= regress.a2.out -FILES+= regress.a3.out -FILES+= regress.a4.out -FILES+= regress.a5.out -FILES+= regress.b1.out -FILES+= regress.b2.out -FILES+= regress.b3.out -FILES+= regress.b4.out -FILES+= regress.b5.out -FILES+= regress.s1.out -FILES+= regress.s2.out -FILES+= regress.s3.out -FILES+= regress.s4.out -FILES+= regress.sh -FILES+= regress.w0-1.out -FILES+= regress.w0-2.out -FILES+= regress.w0-3.out -FILES+= regress.w0-4.out -FILES+= regress.w0-5.out -FILES+= regress.w0-6.out -FILES+= regress.w0-7.out -FILES+= regress.wn-1.out -FILES+= regress.wn-2.out -FILES+= regress.wn-3.out -FILES+= regress.wn-4.out -FILES+= regress.wn-5.out -FILES+= regress.wn-6.out -FILES+= regress.wn-7.out +${PACKAGE}FILES+= calendar.calibrate +${PACKAGE}FILES+= regress.a1.out +${PACKAGE}FILES+= regress.a2.out +${PACKAGE}FILES+= regress.a3.out +${PACKAGE}FILES+= regress.a4.out +${PACKAGE}FILES+= regress.a5.out +${PACKAGE}FILES+= regress.b1.out +${PACKAGE}FILES+= regress.b2.out +${PACKAGE}FILES+= regress.b3.out +${PACKAGE}FILES+= regress.b4.out +${PACKAGE}FILES+= regress.b5.out +${PACKAGE}FILES+= regress.s1.out +${PACKAGE}FILES+= regress.s2.out +${PACKAGE}FILES+= regress.s3.out +${PACKAGE}FILES+= regress.s4.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.w0-1.out +${PACKAGE}FILES+= regress.w0-2.out +${PACKAGE}FILES+= regress.w0-3.out +${PACKAGE}FILES+= regress.w0-4.out +${PACKAGE}FILES+= regress.w0-5.out +${PACKAGE}FILES+= regress.w0-6.out +${PACKAGE}FILES+= regress.w0-7.out +${PACKAGE}FILES+= regress.wn-1.out +${PACKAGE}FILES+= regress.wn-2.out +${PACKAGE}FILES+= regress.wn-3.out +${PACKAGE}FILES+= regress.wn-4.out +${PACKAGE}FILES+= regress.wn-5.out +${PACKAGE}FILES+= regress.wn-6.out +${PACKAGE}FILES+= regress.wn-7.out .include Index: head/usr.bin/cmp/tests/Makefile =================================================================== --- head/usr.bin/cmp/tests/Makefile (revision 299093) +++ head/usr.bin/cmp/tests/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= cmp_test .include .include Index: head/usr.bin/col/tests/Makefile =================================================================== --- head/usr.bin/col/tests/Makefile (revision 299093) +++ head/usr.bin/col/tests/Makefile (revision 299094) @@ -1,13 +1,11 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= col -FILES= rlf.in \ +${PACKAGE}FILES+= \ + rlf.in \ rlf2.in -FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/comm/tests/Makefile =================================================================== --- head/usr.bin/comm/tests/Makefile (revision 299093) +++ head/usr.bin/comm/tests/Makefile (revision 299094) @@ -1,21 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.00.out -FILES+= regress.00a.in -FILES+= regress.00b.in -FILES+= regress.01.out -FILES+= regress.01a.in -FILES+= regress.01b.in -FILES+= regress.02.out -FILES+= regress.02a.in -FILES+= regress.02b.in -FILES+= regress.sh +${PACKAGE}FILES+= regress.00.out +${PACKAGE}FILES+= regress.00a.in +${PACKAGE}FILES+= regress.00b.in +${PACKAGE}FILES+= regress.01.out +${PACKAGE}FILES+= regress.01a.in +${PACKAGE}FILES+= regress.01b.in +${PACKAGE}FILES+= regress.02.out +${PACKAGE}FILES+= regress.02a.in +${PACKAGE}FILES+= regress.02b.in +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/cpio/tests/Makefile =================================================================== --- head/usr.bin/cpio/tests/Makefile (revision 299093) +++ head/usr.bin/cpio/tests/Makefile (revision 299094) @@ -1,117 +1,115 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} PROGS+= bsdcpio_test CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC .PATH: ${_LIBARCHIVEDIR}/cpio CPIO_SRCS= cmdline.c .PATH: ${_LIBARCHIVEDIR}/libarchive_fe CPIO_SRCS+= err.c .PATH: ${_LIBARCHIVEDIR}/cpio/test TESTS_SRCS= \ test_0.c \ test_basic.c \ test_cmdline.c \ test_extract_cpio_Z.c \ test_extract_cpio_bz2.c \ test_extract_cpio_grz.c \ test_extract_cpio_gz.c \ test_extract_cpio_lrz.c \ test_extract_cpio_lz.c \ test_extract_cpio_lzma.c \ test_extract_cpio_lzo.c \ test_extract_cpio_xz.c \ test_format_newc.c \ test_gcpio_compat.c \ test_option_0.c \ test_option_B_upper.c \ test_option_C_upper.c \ test_option_J_upper.c \ test_option_L_upper.c \ test_option_Z_upper.c \ test_option_a.c \ test_option_b64encode.c \ test_option_c.c \ test_option_d.c \ test_option_f.c \ test_option_grzip.c \ test_option_help.c \ test_option_l.c \ test_option_lrzip.c \ test_option_lzma.c \ test_option_lzop.c \ test_option_m.c \ test_option_t.c \ test_option_u.c \ test_option_uuencode.c \ test_option_version.c \ test_option_xz.c \ test_option_y.c \ test_option_z.c \ test_owner_parse.c \ test_passthrough_dotdot.c \ test_passthrough_reverse.c SRCS.bsdcpio_test= list.h \ ${CPIO_SRCS} \ ${TESTS_SRCS} \ main.c .PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdcpio_test+= test_utils.c LIBADD.bsdcpio_test= archive list.h: ${TESTS_SRCS} Makefile @(cd ${_LIBARCHIVEDIR}/tar/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} CLEANFILES+= list.h list.h.tmp -FILES+= test_extract.cpio.Z.uu -FILES+= test_extract.cpio.bz2.uu -FILES+= test_extract.cpio.grz.uu -FILES+= test_extract.cpio.gz.uu -FILES+= test_extract.cpio.lrz.uu -FILES+= test_extract.cpio.lz.uu -FILES+= test_extract.cpio.lzma.uu -FILES+= test_extract.cpio.lzo.uu -FILES+= test_extract.cpio.xz.uu -FILES+= test_gcpio_compat_ref.bin.uu -FILES+= test_gcpio_compat_ref.crc.uu -FILES+= test_gcpio_compat_ref.newc.uu -FILES+= test_gcpio_compat_ref.ustar.uu -FILES+= test_gcpio_compat_ref_nosym.bin.uu -FILES+= test_gcpio_compat_ref_nosym.crc.uu -FILES+= test_gcpio_compat_ref_nosym.newc.uu -FILES+= test_gcpio_compat_ref_nosym.ustar.uu -FILES+= test_option_f.cpio.uu -FILES+= test_option_m.cpio.uu -FILES+= test_option_t.cpio.uu -FILES+= test_option_t.stdout.uu -FILES+= test_option_tv.stdout.uu +${PACKAGE}FILES+= test_extract.cpio.Z.uu +${PACKAGE}FILES+= test_extract.cpio.bz2.uu +${PACKAGE}FILES+= test_extract.cpio.grz.uu +${PACKAGE}FILES+= test_extract.cpio.gz.uu +${PACKAGE}FILES+= test_extract.cpio.lrz.uu +${PACKAGE}FILES+= test_extract.cpio.lz.uu +${PACKAGE}FILES+= test_extract.cpio.lzma.uu +${PACKAGE}FILES+= test_extract.cpio.lzo.uu +${PACKAGE}FILES+= test_extract.cpio.xz.uu +${PACKAGE}FILES+= test_gcpio_compat_ref.bin.uu +${PACKAGE}FILES+= test_gcpio_compat_ref.crc.uu +${PACKAGE}FILES+= test_gcpio_compat_ref.newc.uu +${PACKAGE}FILES+= test_gcpio_compat_ref.ustar.uu +${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.bin.uu +${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.crc.uu +${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.newc.uu +${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.ustar.uu +${PACKAGE}FILES+= test_option_f.cpio.uu +${PACKAGE}FILES+= test_option_m.cpio.uu +${PACKAGE}FILES+= test_option_t.cpio.uu +${PACKAGE}FILES+= test_option_t.stdout.uu +${PACKAGE}FILES+= test_option_tv.stdout.uu .include Index: head/usr.bin/cut/tests/Makefile =================================================================== --- head/usr.bin/cut/tests/Makefile (revision 299093) +++ head/usr.bin/cut/tests/Makefile (revision 299094) @@ -1,22 +1,17 @@ # $FreeBSD$ -.include - PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} NETBSD_ATF_TESTS_SH= cut_test -FILESDIR= ${TESTSDIR} -FILES= d_basic.out -FILES+= d_cut.in -FILES+= d_dflag.out -FILES+= d_dsflag.out -FILES+= d_latin1.in -FILES+= d_sflag.out -FILES+= d_utf8.in +${PACKAGE}FILES= d_basic.out +${PACKAGE}FILES+= d_cut.in +${PACKAGE}FILES+= d_dflag.out +${PACKAGE}FILES+= d_dsflag.out +${PACKAGE}FILES+= d_latin1.in +${PACKAGE}FILES+= d_sflag.out +${PACKAGE}FILES+= d_utf8.in .include .include Index: head/usr.bin/dirname/tests/Makefile =================================================================== --- head/usr.bin/dirname/tests/Makefile (revision 299093) +++ head/usr.bin/dirname/tests/Makefile (revision 299094) @@ -1,13 +1,7 @@ # $FreeBSD$ -.include - -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= dirname_test .include .include Index: head/usr.bin/file2c/tests/Makefile =================================================================== --- head/usr.bin/file2c/tests/Makefile (revision 299093) +++ head/usr.bin/file2c/tests/Makefile (revision 299094) @@ -1,22 +1,19 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.1.out -FILES+= regress.2.out -FILES+= regress.3.out -FILES+= regress.4.out -FILES+= regress.5.out -FILES+= regress.6.out -FILES+= regress.7.out -FILES+= regress.8.out -FILES+= regress.9.out -FILES+= regress.in -FILES+= regress.sh +${PACKAGE}FILES+= regress.1.out +${PACKAGE}FILES+= regress.2.out +${PACKAGE}FILES+= regress.3.out +${PACKAGE}FILES+= regress.4.out +${PACKAGE}FILES+= regress.5.out +${PACKAGE}FILES+= regress.6.out +${PACKAGE}FILES+= regress.7.out +${PACKAGE}FILES+= regress.8.out +${PACKAGE}FILES+= regress.9.out +${PACKAGE}FILES+= regress.in +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/grep/tests/Makefile =================================================================== --- head/usr.bin/grep/tests/Makefile (revision 299093) +++ head/usr.bin/grep/tests/Makefile (revision 299094) @@ -1,41 +1,36 @@ # $FreeBSD$ -.include - PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} NETBSD_ATF_TESTS_SH= grep_test -FILESDIR= ${TESTSDIR} -FILES= d_basic.out -FILES+= d_begin_end_a.out -FILES+= d_begin_end_b.out -FILES+= d_binary.out -FILES+= d_context2_a.out -FILES+= d_context2_b.out -FILES+= d_context2_c.out -FILES+= d_context_a.in -FILES+= d_context_a.out -FILES+= d_context_b.in -FILES+= d_context_b.out -FILES+= d_context_c.out -FILES+= d_context_d.out -FILES+= d_egrep.out -FILES+= d_file_exp.in -FILES+= d_file_exp.out -FILES+= d_ignore_case.out -FILES+= d_input -FILES+= d_invert.in -FILES+= d_invert.out -FILES+= d_recurse.out -FILES+= d_recurse_symlink.err -FILES+= d_recurse_symlink.out -FILES+= d_whole_line.out -FILES+= d_word_regexps.out -FILES+= d_zgrep.out +${PACKAGE}FILES+= d_basic.out +${PACKAGE}FILES+= d_begin_end_a.out +${PACKAGE}FILES+= d_begin_end_b.out +${PACKAGE}FILES+= d_binary.out +${PACKAGE}FILES+= d_context2_a.out +${PACKAGE}FILES+= d_context2_b.out +${PACKAGE}FILES+= d_context2_c.out +${PACKAGE}FILES+= d_context_a.in +${PACKAGE}FILES+= d_context_a.out +${PACKAGE}FILES+= d_context_b.in +${PACKAGE}FILES+= d_context_b.out +${PACKAGE}FILES+= d_context_c.out +${PACKAGE}FILES+= d_context_d.out +${PACKAGE}FILES+= d_egrep.out +${PACKAGE}FILES+= d_file_exp.in +${PACKAGE}FILES+= d_file_exp.out +${PACKAGE}FILES+= d_ignore_case.out +${PACKAGE}FILES+= d_input +${PACKAGE}FILES+= d_invert.in +${PACKAGE}FILES+= d_invert.out +${PACKAGE}FILES+= d_recurse.out +${PACKAGE}FILES+= d_recurse_symlink.err +${PACKAGE}FILES+= d_recurse_symlink.out +${PACKAGE}FILES+= d_whole_line.out +${PACKAGE}FILES+= d_word_regexps.out +${PACKAGE}FILES+= d_zgrep.out .include .include Index: head/usr.bin/gzip/tests/Makefile =================================================================== --- head/usr.bin/gzip/tests/Makefile (revision 299093) +++ head/usr.bin/gzip/tests/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - NETBSD_ATF_TESTS_SH= gzip_test .include .include Index: head/usr.bin/ident/tests/Makefile =================================================================== --- head/usr.bin/ident/tests/Makefile (revision 299093) +++ head/usr.bin/ident/tests/Makefile (revision 299094) @@ -1,13 +1,11 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= ident -FILES= test.in \ +${PACKAGE}FILES+= \ + test.in \ test.out \ testnoid -FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/join/tests/Makefile =================================================================== --- head/usr.bin/join/tests/Makefile (revision 299093) +++ head/usr.bin/join/tests/Makefile (revision 299094) @@ -1,15 +1,12 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.1.in -FILES+= regress.2.in -FILES+= regress.out -FILES+= regress.sh +${PACKAGE}FILES+= regress.1.in +${PACKAGE}FILES+= regress.2.in +${PACKAGE}FILES+= regress.out +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/jot/tests/Makefile =================================================================== --- head/usr.bin/jot/tests/Makefile (revision 299093) +++ head/usr.bin/jot/tests/Makefile (revision 299094) @@ -1,73 +1,70 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.ascii.out -FILES+= regress.block.out -FILES+= regress.dddd.out -FILES+= regress.dddh.out -FILES+= regress.ddhd.out -FILES+= regress.ddhd2.out -FILES+= regress.ddhh.out -FILES+= regress.ddhh2.out -FILES+= regress.dhdd.out -FILES+= regress.dhdh.out -FILES+= regress.dhhd.out -FILES+= regress.dhhd2.out -FILES+= regress.dhhh.out -FILES+= regress.dhhh2.out -FILES+= regress.ed.out -FILES+= regress.grep.out -FILES+= regress.hddd.out -FILES+= regress.hddd2.out -FILES+= regress.hddh.out -FILES+= regress.hddh2.out -FILES+= regress.hdhd.out -FILES+= regress.hdhd2.out -FILES+= regress.hdhh.out -FILES+= regress.hdhh2.out -FILES+= regress.hhdd.out -FILES+= regress.hhdd2.out -FILES+= regress.hhdh.out -FILES+= regress.hhdh2.out -FILES+= regress.hhhd.out -FILES+= regress.hhhd2.out -FILES+= regress.hhhh.out -FILES+= regress.hhhh2.out -FILES+= regress.n21.out -FILES+= regress.rand1.out -FILES+= regress.rand2.out -FILES+= regress.sh -FILES+= regress.stutter.out -FILES+= regress.stutter2.out -FILES+= regress.tabs.out -FILES+= regress.wX1.out -FILES+= regress.wXl.out -FILES+= regress.wc.out -FILES+= regress.wdl.out -FILES+= regress.wdn.out -FILES+= regress.we.out -FILES+= regress.wf.out -FILES+= regress.wg.out -FILES+= regress.wgd.out -FILES+= regress.wo.out -FILES+= regress.wp1.out -FILES+= regress.wp2.out -FILES+= regress.wp3.out -FILES+= regress.wp4.out -FILES+= regress.wp5.out -FILES+= regress.wp6.out -FILES+= regress.wu.out -FILES+= regress.wwe.out -FILES+= regress.wx.out -FILES+= regress.wxn.out -FILES+= regress.x.out -FILES+= regress.xaa.out -FILES+= regress.yes.out +${PACKAGE}FILES+= regress.ascii.out +${PACKAGE}FILES+= regress.block.out +${PACKAGE}FILES+= regress.dddd.out +${PACKAGE}FILES+= regress.dddh.out +${PACKAGE}FILES+= regress.ddhd.out +${PACKAGE}FILES+= regress.ddhd2.out +${PACKAGE}FILES+= regress.ddhh.out +${PACKAGE}FILES+= regress.ddhh2.out +${PACKAGE}FILES+= regress.dhdd.out +${PACKAGE}FILES+= regress.dhdh.out +${PACKAGE}FILES+= regress.dhhd.out +${PACKAGE}FILES+= regress.dhhd2.out +${PACKAGE}FILES+= regress.dhhh.out +${PACKAGE}FILES+= regress.dhhh2.out +${PACKAGE}FILES+= regress.ed.out +${PACKAGE}FILES+= regress.grep.out +${PACKAGE}FILES+= regress.hddd.out +${PACKAGE}FILES+= regress.hddd2.out +${PACKAGE}FILES+= regress.hddh.out +${PACKAGE}FILES+= regress.hddh2.out +${PACKAGE}FILES+= regress.hdhd.out +${PACKAGE}FILES+= regress.hdhd2.out +${PACKAGE}FILES+= regress.hdhh.out +${PACKAGE}FILES+= regress.hdhh2.out +${PACKAGE}FILES+= regress.hhdd.out +${PACKAGE}FILES+= regress.hhdd2.out +${PACKAGE}FILES+= regress.hhdh.out +${PACKAGE}FILES+= regress.hhdh2.out +${PACKAGE}FILES+= regress.hhhd.out +${PACKAGE}FILES+= regress.hhhd2.out +${PACKAGE}FILES+= regress.hhhh.out +${PACKAGE}FILES+= regress.hhhh2.out +${PACKAGE}FILES+= regress.n21.out +${PACKAGE}FILES+= regress.rand1.out +${PACKAGE}FILES+= regress.rand2.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.stutter.out +${PACKAGE}FILES+= regress.stutter2.out +${PACKAGE}FILES+= regress.tabs.out +${PACKAGE}FILES+= regress.wX1.out +${PACKAGE}FILES+= regress.wXl.out +${PACKAGE}FILES+= regress.wc.out +${PACKAGE}FILES+= regress.wdl.out +${PACKAGE}FILES+= regress.wdn.out +${PACKAGE}FILES+= regress.we.out +${PACKAGE}FILES+= regress.wf.out +${PACKAGE}FILES+= regress.wg.out +${PACKAGE}FILES+= regress.wgd.out +${PACKAGE}FILES+= regress.wo.out +${PACKAGE}FILES+= regress.wp1.out +${PACKAGE}FILES+= regress.wp2.out +${PACKAGE}FILES+= regress.wp3.out +${PACKAGE}FILES+= regress.wp4.out +${PACKAGE}FILES+= regress.wp5.out +${PACKAGE}FILES+= regress.wp6.out +${PACKAGE}FILES+= regress.wu.out +${PACKAGE}FILES+= regress.wwe.out +${PACKAGE}FILES+= regress.wx.out +${PACKAGE}FILES+= regress.wxn.out +${PACKAGE}FILES+= regress.x.out +${PACKAGE}FILES+= regress.xaa.out +${PACKAGE}FILES+= regress.yes.out .include Index: head/usr.bin/lastcomm/tests/Makefile =================================================================== --- head/usr.bin/lastcomm/tests/Makefile (revision 299093) +++ head/usr.bin/lastcomm/tests/Makefile (revision 299094) @@ -1,23 +1,20 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= v1-amd64-acct.in -FILES+= v1-amd64.out -FILES+= v1-i386-acct.in -FILES+= v1-i386.out -FILES+= v1-sparc64-acct.in -FILES+= v1-sparc64.out -FILES+= v2-amd64-acct.in -FILES+= v2-amd64.out -FILES+= v2-i386-acct.in -FILES+= v2-i386.out -FILES+= v2-sparc64-acct.in -FILES+= v2-sparc64.out +${PACKAGE}FILES+= v1-amd64-acct.in +${PACKAGE}FILES+= v1-amd64.out +${PACKAGE}FILES+= v1-i386-acct.in +${PACKAGE}FILES+= v1-i386.out +${PACKAGE}FILES+= v1-sparc64-acct.in +${PACKAGE}FILES+= v1-sparc64.out +${PACKAGE}FILES+= v2-amd64-acct.in +${PACKAGE}FILES+= v2-amd64.out +${PACKAGE}FILES+= v2-i386-acct.in +${PACKAGE}FILES+= v2-i386.out +${PACKAGE}FILES+= v2-sparc64-acct.in +${PACKAGE}FILES+= v2-sparc64.out .include Index: head/usr.bin/limits/tests/Makefile =================================================================== --- head/usr.bin/limits/tests/Makefile (revision 299093) +++ head/usr.bin/limits/tests/Makefile (revision 299094) @@ -1,9 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH+= limits_test .include Index: head/usr.bin/m4/tests/Makefile =================================================================== --- head/usr.bin/m4/tests/Makefile (revision 299093) +++ head/usr.bin/m4/tests/Makefile (revision 299094) @@ -1,54 +1,51 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= args.m4 -FILES+= args2.m4 -FILES+= comments.m4 -FILES+= esyscmd.m4 -FILES+= eval.m4 -FILES+= ff_after_dnl.m4.uu -FILES+= gnueval.m4 -FILES+= gnuformat.m4 -FILES+= gnupatterns.m4 -FILES+= gnupatterns2.m4 -FILES+= gnuprefix.m4 -FILES+= gnusofterror.m4 -FILES+= includes.aux -FILES+= includes.m4 -FILES+= m4wrap3.m4 -FILES+= patterns.m4 -FILES+= quotes.m4 -FILES+= redef.m4 -FILES+= regress.args.out -FILES+= regress.args2.out -FILES+= regress.comments.out -FILES+= regress.esyscmd.out -FILES+= regress.eval.out -FILES+= regress.ff_after_dnl.out -FILES+= regress.gnueval.out -FILES+= regress.gnuformat.out -FILES+= regress.gnupatterns.out -FILES+= regress.gnupatterns2.out -FILES+= regress.gnuprefix.out -FILES+= regress.gnusofterror.out -FILES+= regress.gnutranslit2.out -FILES+= regress.includes.out -FILES+= regress.m4wrap3.out -FILES+= regress.patterns.out -FILES+= regress.quotes.out -FILES+= regress.redef.out -FILES+= regress.sh -FILES+= regress.strangequotes.out -FILES+= regress.translit.out -FILES+= regress.translit2.out -FILES+= strangequotes.m4.uu -FILES+= translit.m4 -FILES+= translit2.m4 +${PACKAGE}FILES+= args.m4 +${PACKAGE}FILES+= args2.m4 +${PACKAGE}FILES+= comments.m4 +${PACKAGE}FILES+= esyscmd.m4 +${PACKAGE}FILES+= eval.m4 +${PACKAGE}FILES+= ff_after_dnl.m4.uu +${PACKAGE}FILES+= gnueval.m4 +${PACKAGE}FILES+= gnuformat.m4 +${PACKAGE}FILES+= gnupatterns.m4 +${PACKAGE}FILES+= gnupatterns2.m4 +${PACKAGE}FILES+= gnuprefix.m4 +${PACKAGE}FILES+= gnusofterror.m4 +${PACKAGE}FILES+= includes.aux +${PACKAGE}FILES+= includes.m4 +${PACKAGE}FILES+= m4wrap3.m4 +${PACKAGE}FILES+= patterns.m4 +${PACKAGE}FILES+= quotes.m4 +${PACKAGE}FILES+= redef.m4 +${PACKAGE}FILES+= regress.args.out +${PACKAGE}FILES+= regress.args2.out +${PACKAGE}FILES+= regress.comments.out +${PACKAGE}FILES+= regress.esyscmd.out +${PACKAGE}FILES+= regress.eval.out +${PACKAGE}FILES+= regress.ff_after_dnl.out +${PACKAGE}FILES+= regress.gnueval.out +${PACKAGE}FILES+= regress.gnuformat.out +${PACKAGE}FILES+= regress.gnupatterns.out +${PACKAGE}FILES+= regress.gnupatterns2.out +${PACKAGE}FILES+= regress.gnuprefix.out +${PACKAGE}FILES+= regress.gnusofterror.out +${PACKAGE}FILES+= regress.gnutranslit2.out +${PACKAGE}FILES+= regress.includes.out +${PACKAGE}FILES+= regress.m4wrap3.out +${PACKAGE}FILES+= regress.patterns.out +${PACKAGE}FILES+= regress.quotes.out +${PACKAGE}FILES+= regress.redef.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.strangequotes.out +${PACKAGE}FILES+= regress.translit.out +${PACKAGE}FILES+= regress.translit2.out +${PACKAGE}FILES+= strangequotes.m4.uu +${PACKAGE}FILES+= translit.m4 +${PACKAGE}FILES+= translit2.m4 .include Index: head/usr.bin/mkimg/tests/Makefile =================================================================== --- head/usr.bin/mkimg/tests/Makefile (revision 299093) +++ head/usr.bin/mkimg/tests/Makefile (revision 299094) @@ -1,21 +1,18 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= mkimg SOURCES!= cd ${.CURDIR}; echo *.uu -FILES= ${SOURCES:S,.gz.uu,,g} -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= ${SOURCES:S,.gz.uu,,g} -${FILES}: +${${PACKAGE}FILES}: uudecode -p ${.CURDIR}/${.TARGET}.gz.uu | gunzip -c > ${.TARGET} -CLEANFILES+= ${FILES} +CLEANFILES+= ${${PACKAGE}FILES}} rebase: (cd ${.CURDIR}; atf-sh mkimg.sh rebase) .include Index: head/usr.bin/ncal/tests/Makefile =================================================================== --- head/usr.bin/ncal/tests/Makefile (revision 299093) +++ head/usr.bin/ncal/tests/Makefile (revision 299094) @@ -1,101 +1,98 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.b-3m200901-jd-nhl.out -FILES+= regress.b-3m200901-md-nhl.out -FILES+= regress.b-3m200902-jd-nhl.out -FILES+= regress.b-3m200902-md-nhl.out -FILES+= regress.b-3m200903-jd-nhl.out -FILES+= regress.b-3m200903-md-nhl.out -FILES+= regress.b-3m200904-jd-nhl.out -FILES+= regress.b-3m200904-md-nhl.out -FILES+= regress.b-3m200905-jd-nhl.out -FILES+= regress.b-3m200905-md-nhl.out -FILES+= regress.b-3m200906-jd-nhl.out -FILES+= regress.b-3m200906-md-nhl.out -FILES+= regress.b-3m200907-jd-nhl.out -FILES+= regress.b-3m200907-md-nhl.out -FILES+= regress.b-3m200908-jd-nhl.out -FILES+= regress.b-3m200908-md-nhl.out -FILES+= regress.b-3m200909-jd-nhl.out -FILES+= regress.b-3m200909-md-nhl.out -FILES+= regress.b-3m200910-jd-nhl.out -FILES+= regress.b-3m200910-md-nhl.out -FILES+= regress.b-3m200911-jd-nhl.out -FILES+= regress.b-3m200911-md-nhl.out -FILES+= regress.b-3m200912-jd-nhl.out -FILES+= regress.b-3m200912-md-nhl.out -FILES+= regress.b-y2008-jd-nhl.out -FILES+= regress.b-y2008-md-nhl.out -FILES+= regress.b-y2009-jd-nhl.out -FILES+= regress.b-y2009-md-nhl.out -FILES+= regress.b-y2010-jd-nhl.out -FILES+= regress.b-y2010-md-nhl.out -FILES+= regress.b-y2011-jd-nhl.out -FILES+= regress.b-y2011-md-nhl.out -FILES+= regress.f-3A-nhl.out -FILES+= regress.f-3AB-nhl.out -FILES+= regress.f-3B-nhl.out -FILES+= regress.f-3gy-nhl.out -FILES+= regress.f-3y-nhl.out -FILES+= regress.f-mgm-nhl.out -FILES+= regress.f-yA-nhl.out -FILES+= regress.f-yAB-nhl.out -FILES+= regress.f-yB-nhl.out -FILES+= regress.f-ygm-nhl.out -FILES+= regress.f-ym-nhl.out -FILES+= regress.r-3m200901-jd-nhl.out -FILES+= regress.r-3m200901-md-nhl.out -FILES+= regress.r-3m200902-jd-nhl.out -FILES+= regress.r-3m200902-md-nhl.out -FILES+= regress.r-3m200903-jd-nhl.out -FILES+= regress.r-3m200903-md-nhl.out -FILES+= regress.r-3m200904-jd-nhl.out -FILES+= regress.r-3m200904-md-nhl.out -FILES+= regress.r-3m200905-jd-nhl.out -FILES+= regress.r-3m200905-md-nhl.out -FILES+= regress.r-3m200906-jd-nhl.out -FILES+= regress.r-3m200906-md-nhl.out -FILES+= regress.r-3m200907-jd-nhl.out -FILES+= regress.r-3m200907-md-nhl.out -FILES+= regress.r-3m200908-jd-nhl.out -FILES+= regress.r-3m200908-md-nhl.out -FILES+= regress.r-3m200909-jd-nhl.out -FILES+= regress.r-3m200909-md-nhl.out -FILES+= regress.r-3m200910-jd-nhl.out -FILES+= regress.r-3m200910-md-nhl.out -FILES+= regress.r-3m200911-jd-nhl.out -FILES+= regress.r-3m200911-md-nhl.out -FILES+= regress.r-3m200912-jd-nhl.out -FILES+= regress.r-3m200912-md-nhl.out -FILES+= regress.r-y2008-jd-nhl.out -FILES+= regress.r-y2008-md-nhl.out -FILES+= regress.r-y2009-jd-nhl.out -FILES+= regress.r-y2009-md-nhl.out -FILES+= regress.r-y2010-jd-nhl.out -FILES+= regress.r-y2010-md-nhl.out -FILES+= regress.r-y2011-jd-nhl.out -FILES+= regress.r-y2011-md-nhl.out -FILES+= regress.s-b-3-nhl.out -FILES+= regress.s-b-A-nhl.out -FILES+= regress.s-b-AB-nhl.out -FILES+= regress.s-b-B-nhl.out -FILES+= regress.s-b-gmgy-nhl.out -FILES+= regress.s-b-m-nhl.out -FILES+= regress.s-b-mgy-nhl.out -FILES+= regress.s-r-3-nhl.out -FILES+= regress.s-r-A-nhl.out -FILES+= regress.s-r-AB-nhl.out -FILES+= regress.s-r-B-nhl.out -FILES+= regress.s-r-gmgy-nhl.out -FILES+= regress.s-r-m-nhl.out -FILES+= regress.s-r-mgy-nhl.out -FILES+= regress.sh +${PACKAGE}FILES+= regress.b-3m200901-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200901-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200902-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200902-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200903-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200903-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200904-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200904-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200905-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200905-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200906-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200906-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200907-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200907-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200908-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200908-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200909-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200909-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200910-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200910-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200911-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200911-md-nhl.out +${PACKAGE}FILES+= regress.b-3m200912-jd-nhl.out +${PACKAGE}FILES+= regress.b-3m200912-md-nhl.out +${PACKAGE}FILES+= regress.b-y2008-jd-nhl.out +${PACKAGE}FILES+= regress.b-y2008-md-nhl.out +${PACKAGE}FILES+= regress.b-y2009-jd-nhl.out +${PACKAGE}FILES+= regress.b-y2009-md-nhl.out +${PACKAGE}FILES+= regress.b-y2010-jd-nhl.out +${PACKAGE}FILES+= regress.b-y2010-md-nhl.out +${PACKAGE}FILES+= regress.b-y2011-jd-nhl.out +${PACKAGE}FILES+= regress.b-y2011-md-nhl.out +${PACKAGE}FILES+= regress.f-3A-nhl.out +${PACKAGE}FILES+= regress.f-3AB-nhl.out +${PACKAGE}FILES+= regress.f-3B-nhl.out +${PACKAGE}FILES+= regress.f-3gy-nhl.out +${PACKAGE}FILES+= regress.f-3y-nhl.out +${PACKAGE}FILES+= regress.f-mgm-nhl.out +${PACKAGE}FILES+= regress.f-yA-nhl.out +${PACKAGE}FILES+= regress.f-yAB-nhl.out +${PACKAGE}FILES+= regress.f-yB-nhl.out +${PACKAGE}FILES+= regress.f-ygm-nhl.out +${PACKAGE}FILES+= regress.f-ym-nhl.out +${PACKAGE}FILES+= regress.r-3m200901-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200901-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200902-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200902-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200903-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200903-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200904-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200904-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200905-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200905-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200906-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200906-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200907-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200907-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200908-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200908-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200909-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200909-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200910-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200910-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200911-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200911-md-nhl.out +${PACKAGE}FILES+= regress.r-3m200912-jd-nhl.out +${PACKAGE}FILES+= regress.r-3m200912-md-nhl.out +${PACKAGE}FILES+= regress.r-y2008-jd-nhl.out +${PACKAGE}FILES+= regress.r-y2008-md-nhl.out +${PACKAGE}FILES+= regress.r-y2009-jd-nhl.out +${PACKAGE}FILES+= regress.r-y2009-md-nhl.out +${PACKAGE}FILES+= regress.r-y2010-jd-nhl.out +${PACKAGE}FILES+= regress.r-y2010-md-nhl.out +${PACKAGE}FILES+= regress.r-y2011-jd-nhl.out +${PACKAGE}FILES+= regress.r-y2011-md-nhl.out +${PACKAGE}FILES+= regress.s-b-3-nhl.out +${PACKAGE}FILES+= regress.s-b-A-nhl.out +${PACKAGE}FILES+= regress.s-b-AB-nhl.out +${PACKAGE}FILES+= regress.s-b-B-nhl.out +${PACKAGE}FILES+= regress.s-b-gmgy-nhl.out +${PACKAGE}FILES+= regress.s-b-m-nhl.out +${PACKAGE}FILES+= regress.s-b-mgy-nhl.out +${PACKAGE}FILES+= regress.s-r-3-nhl.out +${PACKAGE}FILES+= regress.s-r-A-nhl.out +${PACKAGE}FILES+= regress.s-r-AB-nhl.out +${PACKAGE}FILES+= regress.s-r-B-nhl.out +${PACKAGE}FILES+= regress.s-r-gmgy-nhl.out +${PACKAGE}FILES+= regress.s-r-m-nhl.out +${PACKAGE}FILES+= regress.s-r-mgy-nhl.out +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/printf/tests/Makefile =================================================================== --- head/usr.bin/printf/tests/Makefile (revision 299093) +++ head/usr.bin/printf/tests/Makefile (revision 299094) @@ -1,25 +1,22 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.b.out -FILES+= regress.d.out -FILES+= regress.f.out -FILES+= regress.l1.out -FILES+= regress.l2.out -FILES+= regress.m1.out -FILES+= regress.m2.out -FILES+= regress.m3.out -FILES+= regress.m4.out -FILES+= regress.m5.out -FILES+= regress.missingpos1.out -FILES+= regress.s.out -FILES+= regress.sh -FILES+= regress.zero.out +${PACKAGE}FILES+= regress.b.out +${PACKAGE}FILES+= regress.d.out +${PACKAGE}FILES+= regress.f.out +${PACKAGE}FILES+= regress.l1.out +${PACKAGE}FILES+= regress.l2.out +${PACKAGE}FILES+= regress.m1.out +${PACKAGE}FILES+= regress.m2.out +${PACKAGE}FILES+= regress.m3.out +${PACKAGE}FILES+= regress.m4.out +${PACKAGE}FILES+= regress.m5.out +${PACKAGE}FILES+= regress.missingpos1.out +${PACKAGE}FILES+= regress.s.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.zero.out .include Index: head/usr.bin/sdiff/tests/Makefile =================================================================== --- head/usr.bin/sdiff/tests/Makefile (revision 299093) +++ head/usr.bin/sdiff/tests/Makefile (revision 299094) @@ -1,38 +1,35 @@ # $FreeBSD$ PACKAGE= tests -FILEGROUPS= TESTS -TESTPACKAGE= ${PACKAGE} -TESTDIR= ${TESTSBASE}/usr.bin/sdiff ATF_TESTS_SH= sdiff -FILESDIR= ${TESTDIR} -FILES= d_dot.in \ +${PACKAGE}FILES+= \ + d_dot.in \ d_flags_l.out \ d_flags_s.out \ d_flags_w.out \ d_iflags_a1.out \ d_iflags_a2.out \ d_iflags_b1.out \ d_iflags_b2.out \ d_iflags_c1.out \ d_iflags_c2.out \ d_iflags_d1.out \ d_iflags_d2.out \ d_input1 \ d_input2 \ d_oneline.in \ d_oneline_a.out \ d_oneline_b.out \ d_same.out \ d_short.out \ d_tabends.in \ d_tabends_a.out \ d_tabends_b.out \ d_tabends_c.out \ d_tabs.out \ d_tabs1.in \ d_tabs2.in .include Index: head/usr.bin/sed/tests/Makefile =================================================================== --- head/usr.bin/sed/tests/Makefile (revision 299093) +++ head/usr.bin/sed/tests/Makefile (revision 299094) @@ -1,41 +1,38 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test TAP_TESTS_SH+= multi_test TEST_METADATA.multi_test+= required_files="/usr/share/dict/words" TAP_TESTS_SH+= inplace_race_test -FILESDIR= ${TESTSDIR} -FILES= hanoi.sed -FILES+= math.sed -FILES+= regress.G.out -FILES+= regress.P.out -FILES+= regress.b2a.out -FILES+= regress.bcb.out -FILES+= regress.c0.out -FILES+= regress.c1.out -FILES+= regress.c2.out -FILES+= regress.c3.out -FILES+= regress.hanoi.out -FILES+= regress.icase1.out -FILES+= regress.icase2.out -FILES+= regress.icase3.out -FILES+= regress.icase4.out -FILES+= regress.in -FILES+= regress.math.out -FILES+= regress.not.out -FILES+= regress.psl.out -FILES+= regress.s3.out -FILES+= regress.s4.out -FILES+= regress.s5.out -FILES+= regress.sg.out -FILES+= regress.sh -FILES+= regress.y.out +${PACKAGE}FILES+= hanoi.sed +${PACKAGE}FILES+= math.sed +${PACKAGE}FILES+= regress.G.out +${PACKAGE}FILES+= regress.P.out +${PACKAGE}FILES+= regress.b2a.out +${PACKAGE}FILES+= regress.bcb.out +${PACKAGE}FILES+= regress.c0.out +${PACKAGE}FILES+= regress.c1.out +${PACKAGE}FILES+= regress.c2.out +${PACKAGE}FILES+= regress.c3.out +${PACKAGE}FILES+= regress.hanoi.out +${PACKAGE}FILES+= regress.icase1.out +${PACKAGE}FILES+= regress.icase2.out +${PACKAGE}FILES+= regress.icase3.out +${PACKAGE}FILES+= regress.icase4.out +${PACKAGE}FILES+= regress.in +${PACKAGE}FILES+= regress.math.out +${PACKAGE}FILES+= regress.not.out +${PACKAGE}FILES+= regress.psl.out +${PACKAGE}FILES+= regress.s3.out +${PACKAGE}FILES+= regress.s4.out +${PACKAGE}FILES+= regress.s5.out +${PACKAGE}FILES+= regress.sg.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.y.out SUBDIR= regress.multitest.out .include Index: head/usr.bin/sed/tests/regress.multitest.out/Makefile =================================================================== --- head/usr.bin/sed/tests/regress.multitest.out/Makefile (revision 299093) +++ head/usr.bin/sed/tests/regress.multitest.out/Makefile (revision 299094) @@ -1,139 +1,137 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSDIR= ${TESTSBASE}/usr.bin/sed/regress.multitest.out -FILESDIR= ${TESTSDIR} -FILES= 1.1 -FILES+= 1.10 -FILES+= 1.11 -FILES+= 1.12 -FILES+= 1.13 -FILES+= 1.14 -FILES+= 1.15 -FILES+= 1.16 -FILES+= 1.17 -FILES+= 1.18 -FILES+= 1.2 -FILES+= 1.3 -FILES+= 1.4 -FILES+= 1.4.1 -FILES+= 1.5 -FILES+= 1.6 -FILES+= 1.7 -FILES+= 1.8 -FILES+= 1.9 -FILES+= 2.1 -FILES+= 2.10 -FILES+= 2.11 -FILES+= 2.12 -FILES+= 2.13 -FILES+= 2.14 -FILES+= 2.15 -FILES+= 2.16 -FILES+= 2.17 -FILES+= 2.18 -FILES+= 2.19 -FILES+= 2.2 -FILES+= 2.20 -FILES+= 2.21 -FILES+= 2.22 -FILES+= 2.3 -FILES+= 2.4 -FILES+= 2.5 -FILES+= 2.6 -FILES+= 2.7 -FILES+= 2.8 -FILES+= 2.9 -FILES+= 3.1 -FILES+= 3.2 -FILES+= 3.3 -FILES+= 3.4 -FILES+= 4.1 -FILES+= 4.2 -FILES+= 4.3 -FILES+= 4.4 -FILES+= 4.5 -FILES+= 4.6 -FILES+= 4.7 -FILES+= 4.8 -FILES+= 5.1 -FILES+= 5.2 -FILES+= 5.3 -FILES+= 5.4 -FILES+= 5.5 -FILES+= 5.6 -FILES+= 5.7 -FILES+= 5.8 -FILES+= 6.1 -FILES+= 6.2 -FILES+= 6.3 -FILES+= 6.4 -FILES+= 6.5 -FILES+= 6.6 -FILES+= 7.1 -FILES+= 7.2 -FILES+= 7.3 -FILES+= 7.4 -FILES+= 7.5 -FILES+= 7.6 -FILES+= 7.7 -FILES+= 7.8 -FILES+= 8.1 -FILES+= 8.10 -FILES+= 8.11 -FILES+= 8.12 -FILES+= 8.13 -FILES+= 8.14 -FILES+= 8.15 -FILES+= 8.16 -FILES+= 8.17 -FILES+= 8.18 -FILES+= 8.19 -FILES+= 8.2 -FILES+= 8.20 -FILES+= 8.21 -FILES+= 8.22 -FILES+= 8.23 -FILES+= 8.3 -FILES+= 8.4 -FILES+= 8.5 -FILES+= 8.6 -FILES+= 8.7 -FILES+= 8.8 -FILES+= 8.9 -FILES+= 9.1 -FILES+= 9.10 -FILES+= 9.11 -FILES+= 9.12 -FILES+= 9.13 -FILES+= 9.14 -FILES+= 9.15 -FILES+= 9.16 -FILES+= 9.17 -FILES+= 9.18 -FILES+= 9.19 -FILES+= 9.2 -FILES+= 9.20 -FILES+= 9.21 -FILES+= 9.22 -FILES+= 9.23 -FILES+= 9.24 -FILES+= 9.25 -FILES+= 9.26 -FILES+= 9.27 -FILES+= 9.28 -FILES+= 9.29 -FILES+= 9.3 -FILES+= 9.30 -FILES+= 9.31 -FILES+= 9.4 -FILES+= 9.5 -FILES+= 9.6 -FILES+= 9.7 -FILES+= 9.8 -FILES+= 9.9 +${PACKAGE}FILES+= 1.1 +${PACKAGE}FILES+= 1.10 +${PACKAGE}FILES+= 1.11 +${PACKAGE}FILES+= 1.12 +${PACKAGE}FILES+= 1.13 +${PACKAGE}FILES+= 1.14 +${PACKAGE}FILES+= 1.15 +${PACKAGE}FILES+= 1.16 +${PACKAGE}FILES+= 1.17 +${PACKAGE}FILES+= 1.18 +${PACKAGE}FILES+= 1.2 +${PACKAGE}FILES+= 1.3 +${PACKAGE}FILES+= 1.4 +${PACKAGE}FILES+= 1.4.1 +${PACKAGE}FILES+= 1.5 +${PACKAGE}FILES+= 1.6 +${PACKAGE}FILES+= 1.7 +${PACKAGE}FILES+= 1.8 +${PACKAGE}FILES+= 1.9 +${PACKAGE}FILES+= 2.1 +${PACKAGE}FILES+= 2.10 +${PACKAGE}FILES+= 2.11 +${PACKAGE}FILES+= 2.12 +${PACKAGE}FILES+= 2.13 +${PACKAGE}FILES+= 2.14 +${PACKAGE}FILES+= 2.15 +${PACKAGE}FILES+= 2.16 +${PACKAGE}FILES+= 2.17 +${PACKAGE}FILES+= 2.18 +${PACKAGE}FILES+= 2.19 +${PACKAGE}FILES+= 2.2 +${PACKAGE}FILES+= 2.20 +${PACKAGE}FILES+= 2.21 +${PACKAGE}FILES+= 2.22 +${PACKAGE}FILES+= 2.3 +${PACKAGE}FILES+= 2.4 +${PACKAGE}FILES+= 2.5 +${PACKAGE}FILES+= 2.6 +${PACKAGE}FILES+= 2.7 +${PACKAGE}FILES+= 2.8 +${PACKAGE}FILES+= 2.9 +${PACKAGE}FILES+= 3.1 +${PACKAGE}FILES+= 3.2 +${PACKAGE}FILES+= 3.3 +${PACKAGE}FILES+= 3.4 +${PACKAGE}FILES+= 4.1 +${PACKAGE}FILES+= 4.2 +${PACKAGE}FILES+= 4.3 +${PACKAGE}FILES+= 4.4 +${PACKAGE}FILES+= 4.5 +${PACKAGE}FILES+= 4.6 +${PACKAGE}FILES+= 4.7 +${PACKAGE}FILES+= 4.8 +${PACKAGE}FILES+= 5.1 +${PACKAGE}FILES+= 5.2 +${PACKAGE}FILES+= 5.3 +${PACKAGE}FILES+= 5.4 +${PACKAGE}FILES+= 5.5 +${PACKAGE}FILES+= 5.6 +${PACKAGE}FILES+= 5.7 +${PACKAGE}FILES+= 5.8 +${PACKAGE}FILES+= 6.1 +${PACKAGE}FILES+= 6.2 +${PACKAGE}FILES+= 6.3 +${PACKAGE}FILES+= 6.4 +${PACKAGE}FILES+= 6.5 +${PACKAGE}FILES+= 6.6 +${PACKAGE}FILES+= 7.1 +${PACKAGE}FILES+= 7.2 +${PACKAGE}FILES+= 7.3 +${PACKAGE}FILES+= 7.4 +${PACKAGE}FILES+= 7.5 +${PACKAGE}FILES+= 7.6 +${PACKAGE}FILES+= 7.7 +${PACKAGE}FILES+= 7.8 +${PACKAGE}FILES+= 8.1 +${PACKAGE}FILES+= 8.10 +${PACKAGE}FILES+= 8.11 +${PACKAGE}FILES+= 8.12 +${PACKAGE}FILES+= 8.13 +${PACKAGE}FILES+= 8.14 +${PACKAGE}FILES+= 8.15 +${PACKAGE}FILES+= 8.16 +${PACKAGE}FILES+= 8.17 +${PACKAGE}FILES+= 8.18 +${PACKAGE}FILES+= 8.19 +${PACKAGE}FILES+= 8.2 +${PACKAGE}FILES+= 8.20 +${PACKAGE}FILES+= 8.21 +${PACKAGE}FILES+= 8.22 +${PACKAGE}FILES+= 8.23 +${PACKAGE}FILES+= 8.3 +${PACKAGE}FILES+= 8.4 +${PACKAGE}FILES+= 8.5 +${PACKAGE}FILES+= 8.6 +${PACKAGE}FILES+= 8.7 +${PACKAGE}FILES+= 8.8 +${PACKAGE}FILES+= 8.9 +${PACKAGE}FILES+= 9.1 +${PACKAGE}FILES+= 9.10 +${PACKAGE}FILES+= 9.11 +${PACKAGE}FILES+= 9.12 +${PACKAGE}FILES+= 9.13 +${PACKAGE}FILES+= 9.14 +${PACKAGE}FILES+= 9.15 +${PACKAGE}FILES+= 9.16 +${PACKAGE}FILES+= 9.17 +${PACKAGE}FILES+= 9.18 +${PACKAGE}FILES+= 9.19 +${PACKAGE}FILES+= 9.2 +${PACKAGE}FILES+= 9.20 +${PACKAGE}FILES+= 9.21 +${PACKAGE}FILES+= 9.22 +${PACKAGE}FILES+= 9.23 +${PACKAGE}FILES+= 9.24 +${PACKAGE}FILES+= 9.25 +${PACKAGE}FILES+= 9.26 +${PACKAGE}FILES+= 9.27 +${PACKAGE}FILES+= 9.28 +${PACKAGE}FILES+= 9.29 +${PACKAGE}FILES+= 9.3 +${PACKAGE}FILES+= 9.30 +${PACKAGE}FILES+= 9.31 +${PACKAGE}FILES+= 9.4 +${PACKAGE}FILES+= 9.5 +${PACKAGE}FILES+= 9.6 +${PACKAGE}FILES+= 9.7 +${PACKAGE}FILES+= 9.8 +${PACKAGE}FILES+= 9.9 .include Index: head/usr.bin/soelim/tests/Makefile =================================================================== --- head/usr.bin/soelim/tests/Makefile (revision 299093) +++ head/usr.bin/soelim/tests/Makefile (revision 299094) @@ -1,17 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= soelim -FILES= nonexisting.in \ +${PACKAGE}FILES+= nonexisting.in \ basic.in \ basic \ basic.out \ basic-with-space.in \ basic-with-space.out -FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/tar/tests/Makefile =================================================================== --- head/usr.bin/tar/tests/Makefile (revision 299093) +++ head/usr.bin/tar/tests/Makefile (revision 299094) @@ -1,110 +1,108 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -static CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC PROGS+= bsdtar_test .PATH: ${_LIBARCHIVEDIR}/tar/test TESTS_SRCS= \ test_0.c \ test_basic.c \ test_copy.c \ test_empty_mtree.c \ test_extract_tar_bz2.c \ test_extract_tar_grz.c \ test_extract_tar_gz.c \ test_extract_tar_lrz.c \ test_extract_tar_lz.c \ test_extract_tar_lzma.c \ test_extract_tar_lzo.c \ test_extract_tar_xz.c \ test_format_newc.c \ test_help.c \ test_option_C_upper.c \ test_option_H_upper.c \ test_option_L_upper.c \ test_option_O_upper.c \ test_option_T_upper.c \ test_option_U_upper.c \ test_option_X_upper.c \ test_option_a.c \ test_option_b.c \ test_option_b64encode.c \ test_option_exclude.c \ test_option_gid_gname.c \ test_option_grzip.c \ test_option_j.c \ test_option_k.c \ test_option_keep_newer_files.c \ test_option_lrzip.c \ test_option_lzma.c \ test_option_lzop.c \ test_option_n.c \ test_option_newer_than.c \ test_option_nodump.c \ test_option_older_than.c \ test_option_q.c \ test_option_r.c \ test_option_s.c \ test_option_uid_uname.c \ test_option_uuencode.c \ test_option_xz.c \ test_option_z.c \ test_patterns.c \ test_print_longpath.c \ test_stdio.c \ test_strip_components.c \ test_symlink_dir.c \ test_version.c SRCS.bsdtar_test= \ ${TESTS_SRCS} \ list.h \ main.c .PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdtar_test+= test_utils.c LIBADD.bsdtar_test= archive list.h: ${TESTS_SRCS} Makefile @(cd ${_LIBARCHIVEDIR}/tar/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} CLEANFILES+= list.h list.h.tmp -FILES+= test_extract.tar.Z.uu -FILES+= test_extract.tar.bz2.uu -FILES+= test_extract.tar.grz.uu -FILES+= test_extract.tar.gz.uu -FILES+= test_extract.tar.lrz.uu -FILES+= test_extract.tar.lz.uu -FILES+= test_extract.tar.lzma.uu -FILES+= test_extract.tar.lzo.uu -FILES+= test_extract.tar.xz.uu -FILES+= test_option_keep_newer_files.tar.Z.uu -FILES+= test_option_s.tar.Z.uu -FILES+= test_patterns_2.tar.uu -FILES+= test_patterns_3.tar.uu -FILES+= test_patterns_4.tar.uu -FILES+= test_print_longpath.tar.Z.uu +${PACKAGE}FILES+= test_extract.tar.Z.uu +${PACKAGE}FILES+= test_extract.tar.bz2.uu +${PACKAGE}FILES+= test_extract.tar.grz.uu +${PACKAGE}FILES+= test_extract.tar.gz.uu +${PACKAGE}FILES+= test_extract.tar.lrz.uu +${PACKAGE}FILES+= test_extract.tar.lz.uu +${PACKAGE}FILES+= test_extract.tar.lzma.uu +${PACKAGE}FILES+= test_extract.tar.lzo.uu +${PACKAGE}FILES+= test_extract.tar.xz.uu +${PACKAGE}FILES+= test_option_keep_newer_files.tar.Z.uu +${PACKAGE}FILES+= test_option_s.tar.Z.uu +${PACKAGE}FILES+= test_patterns_2.tar.uu +${PACKAGE}FILES+= test_patterns_3.tar.uu +${PACKAGE}FILES+= test_patterns_4.tar.uu +${PACKAGE}FILES+= test_print_longpath.tar.Z.uu .include Index: head/usr.bin/tests/Makefile =================================================================== --- head/usr.bin/tests/Makefile (revision 299093) +++ head/usr.bin/tests/Makefile (revision 299094) @@ -1,17 +1,10 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes -FILESDIR= ${TESTSDIR} -FILES= regress.m4 +${PACKAGE}FILES+= regress.m4 .include Index: head/usr.bin/timeout/tests/Makefile =================================================================== --- head/usr.bin/timeout/tests/Makefile (revision 299093) +++ head/usr.bin/timeout/tests/Makefile (revision 299094) @@ -1,10 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/usr.bin/timeout - ATF_TESTS_SH= timeout .include Index: head/usr.bin/tr/tests/Makefile =================================================================== --- head/usr.bin/tr/tests/Makefile (revision 299093) +++ head/usr.bin/tr/tests/Makefile (revision 299094) @@ -1,29 +1,25 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/usr.bin/tr TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.00.out -FILES+= regress.01.out -FILES+= regress.02.out -FILES+= regress.03.out -FILES+= regress.04.out -FILES+= regress.05.out -FILES+= regress.06.out -FILES+= regress.07.out -FILES+= regress.08.out -FILES+= regress.09.out -FILES+= regress.0a.out -FILES+= regress.0b.out -FILES+= regress.0c.out -FILES+= regress.0d.out -FILES+= regress.in -FILES+= regress.sh -FILES+= regress2.in +${PACKAGE}FILES+= regress.00.out +${PACKAGE}FILES+= regress.01.out +${PACKAGE}FILES+= regress.02.out +${PACKAGE}FILES+= regress.03.out +${PACKAGE}FILES+= regress.04.out +${PACKAGE}FILES+= regress.05.out +${PACKAGE}FILES+= regress.06.out +${PACKAGE}FILES+= regress.07.out +${PACKAGE}FILES+= regress.08.out +${PACKAGE}FILES+= regress.09.out +${PACKAGE}FILES+= regress.0a.out +${PACKAGE}FILES+= regress.0b.out +${PACKAGE}FILES+= regress.0c.out +${PACKAGE}FILES+= regress.0d.out +${PACKAGE}FILES+= regress.in +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress2.in .include Index: head/usr.bin/truncate/tests/Makefile =================================================================== --- head/usr.bin/truncate/tests/Makefile (revision 299093) +++ head/usr.bin/truncate/tests/Makefile (revision 299094) @@ -1,9 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH= truncate_test .include Index: head/usr.bin/units/tests/Makefile =================================================================== --- head/usr.bin/units/tests/Makefile (revision 299093) +++ head/usr.bin/units/tests/Makefile (revision 299094) @@ -1,11 +1,7 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= basics_test .include Index: head/usr.bin/uudecode/tests/Makefile =================================================================== --- head/usr.bin/uudecode/tests/Makefile (revision 299093) +++ head/usr.bin/uudecode/tests/Makefile (revision 299094) @@ -1,15 +1,12 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.base64.in -FILES+= regress.out -FILES+= regress.sh -FILES+= regress.traditional.in +${PACKAGE}FILES+= regress.base64.in +${PACKAGE}FILES+= regress.out +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.traditional.in .include Index: head/usr.bin/uuencode/tests/Makefile =================================================================== --- head/usr.bin/uuencode/tests/Makefile (revision 299093) +++ head/usr.bin/uuencode/tests/Makefile (revision 299094) @@ -1,15 +1,12 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.base64.out -FILES+= regress.in -FILES+= regress.sh -FILES+= regress.traditional.out +${PACKAGE}FILES+= regress.base64.out +${PACKAGE}FILES+= regress.in +${PACKAGE}FILES+= regress.sh +${PACKAGE}FILES+= regress.traditional.out .include Index: head/usr.bin/xargs/tests/Makefile =================================================================== --- head/usr.bin/xargs/tests/Makefile (revision 299093) +++ head/usr.bin/xargs/tests/Makefile (revision 299094) @@ -1,31 +1,28 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= regress.0.in -FILES+= regress.0.out -FILES+= regress.0I.out -FILES+= regress.0J.out -FILES+= regress.0L.out -FILES+= regress.0P1.out -FILES+= regress.I.out -FILES+= regress.J.out -FILES+= regress.L.out -FILES+= regress.P1.out -FILES+= regress.R.out -FILES+= regress.in -FILES+= regress.n1.out -FILES+= regress.n2.out -FILES+= regress.n2P0.out -FILES+= regress.n3.out -FILES+= regress.normal.out -FILES+= regress.quotes.in -FILES+= regress.quotes.out -FILES+= regress.sh +${PACKAGE}FILES+= regress.0.in +${PACKAGE}FILES+= regress.0.out +${PACKAGE}FILES+= regress.0I.out +${PACKAGE}FILES+= regress.0J.out +${PACKAGE}FILES+= regress.0L.out +${PACKAGE}FILES+= regress.0P1.out +${PACKAGE}FILES+= regress.I.out +${PACKAGE}FILES+= regress.J.out +${PACKAGE}FILES+= regress.L.out +${PACKAGE}FILES+= regress.P1.out +${PACKAGE}FILES+= regress.R.out +${PACKAGE}FILES+= regress.in +${PACKAGE}FILES+= regress.n1.out +${PACKAGE}FILES+= regress.n2.out +${PACKAGE}FILES+= regress.n2P0.out +${PACKAGE}FILES+= regress.n3.out +${PACKAGE}FILES+= regress.normal.out +${PACKAGE}FILES+= regress.quotes.in +${PACKAGE}FILES+= regress.quotes.out +${PACKAGE}FILES+= regress.sh .include Index: head/usr.bin/xo/tests/Makefile =================================================================== --- head/usr.bin/xo/tests/Makefile (revision 299093) +++ head/usr.bin/xo/tests/Makefile (revision 299094) @@ -1,45 +1,41 @@ # $FreeBSD$ -.include - PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} +.include + LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/tests/xo ${LIBXOSRC}/tests/xo/saved .c.out .o.out: -TESTSDIR= ${TESTSBASE}/usr.bin/xo - BINDIR= ${TESTSDIR} ATF_TESTS_SH+= functional_test -FILES+= xo_01.H.err -FILES+= xo_01.H.out -FILES+= xo_01.HIPx.err -FILES+= xo_01.HIPx.out -FILES+= xo_01.HP.err -FILES+= xo_01.HP.out -FILES+= xo_01.J.err -FILES+= xo_01.J.out -FILES+= xo_01.JP.err -FILES+= xo_01.JP.out -FILES+= xo_01.T.err -FILES+= xo_01.T.out -FILES+= xo_01.X.err -FILES+= xo_01.X.out -FILES+= xo_01.XP.err -FILES+= xo_01.XP.out +${PACKAGE}FILES+= xo_01.H.err +${PACKAGE}FILES+= xo_01.H.out +${PACKAGE}FILES+= xo_01.HIPx.err +${PACKAGE}FILES+= xo_01.HIPx.out +${PACKAGE}FILES+= xo_01.HP.err +${PACKAGE}FILES+= xo_01.HP.out +${PACKAGE}FILES+= xo_01.J.err +${PACKAGE}FILES+= xo_01.J.out +${PACKAGE}FILES+= xo_01.JP.err +${PACKAGE}FILES+= xo_01.JP.out +${PACKAGE}FILES+= xo_01.T.err +${PACKAGE}FILES+= xo_01.T.out +${PACKAGE}FILES+= xo_01.X.err +${PACKAGE}FILES+= xo_01.X.out +${PACKAGE}FILES+= xo_01.XP.err +${PACKAGE}FILES+= xo_01.XP.out SCRIPTS+= xo_01 CLEANFILES+= xo_01 LIBADD+= xo .include .SUFFIXES: .sh Index: head/usr.bin/yacc/tests/Makefile =================================================================== --- head/usr.bin/yacc/tests/Makefile (revision 299093) +++ head/usr.bin/yacc/tests/Makefile (revision 299094) @@ -1,340 +1,334 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} -PACKAGE= tests - TEST_DIR= ${SRCTOP}/contrib/byacc/test .PATH: ${TEST_DIR} ${TEST_DIR}/yacc PLAIN_TESTS_SH= yacc_tests # NOTE: due to caveats with how permissions are handled on FreeBSD # with root, this must be run as a non-privileged user; otherwise # the testcases will fail unexpectedly. TEST_METADATA.yacc_tests+= required_user="unprivileged" SCRIPTS= run_test SCRIPTSDIR= ${TESTSDIR} CLEANFILES= run_test -FILESGROUPS+= FILES FILEStest FILEStest_yacc -FILESPACKAGE= ${PACKAGE} +FILESGROUPS+= FILEStest FILEStest_yacc FILEStestPACKAGE=${PACKAGE} FILEStest_yaccPACKAGE=${PACKAGE} FILEStestDIR= ${TESTSDIR} FILEStest+= btyacc_calc1.y FILEStest+= btyacc_demo.y FILEStest+= calc.y FILEStest+= calc1.y FILEStest+= calc2.y FILEStest+= calc3.y FILEStest+= code_calc.y FILEStest+= code_debug.y FILEStest+= code_error.y FILEStest+= empty.y FILEStest+= err_inherit1.y FILEStest+= err_inherit2.y FILEStest+= err_inherit3.y FILEStest+= err_inherit4.y FILEStest+= err_inherit5.y FILEStest+= err_syntax1.y FILEStest+= err_syntax10.y FILEStest+= err_syntax11.y FILEStest+= err_syntax12.y FILEStest+= err_syntax13.y FILEStest+= err_syntax14.y FILEStest+= err_syntax15.y FILEStest+= err_syntax16.y FILEStest+= err_syntax17.y FILEStest+= err_syntax18.y FILEStest+= err_syntax19.y FILEStest+= err_syntax2.y FILEStest+= err_syntax20.y FILEStest+= err_syntax21.y FILEStest+= err_syntax22.y FILEStest+= err_syntax23.y FILEStest+= err_syntax24.y FILEStest+= err_syntax25.y FILEStest+= err_syntax26.y FILEStest+= err_syntax27.y FILEStest+= err_syntax3.y FILEStest+= err_syntax4.y FILEStest+= err_syntax5.y FILEStest+= err_syntax6.y FILEStest+= err_syntax7.y FILEStest+= err_syntax7a.y FILEStest+= err_syntax7b.y FILEStest+= err_syntax8.y FILEStest+= err_syntax8a.y FILEStest+= err_syntax9.y FILEStest+= error.y FILEStest+= grammar.y FILEStest+= inherit0.y FILEStest+= inherit1.y FILEStest+= inherit2.y FILEStest+= ok_syntax1.y FILEStest+= pure_calc.y FILEStest+= pure_error.y FILEStest+= quote_calc.y FILEStest+= quote_calc2.y FILEStest+= quote_calc3.y FILEStest+= quote_calc4.y FILEStest+= varsyntax_calc1.y FILEStest_yaccDIR= ${TESTSDIR}/yacc FILEStest_yacc+= big_b.error FILEStest_yacc+= big_b.output FILEStest_yacc+= big_l.error FILEStest_yacc+= big_l.output FILEStest_yacc+= calc.error FILEStest_yacc+= calc.output FILEStest_yacc+= calc.tab.c FILEStest_yacc+= calc.tab.h FILEStest_yacc+= calc1.error FILEStest_yacc+= calc1.output FILEStest_yacc+= calc1.tab.c FILEStest_yacc+= calc1.tab.h FILEStest_yacc+= calc2.error FILEStest_yacc+= calc2.output FILEStest_yacc+= calc2.tab.c FILEStest_yacc+= calc2.tab.h FILEStest_yacc+= calc3.error FILEStest_yacc+= calc3.output FILEStest_yacc+= calc3.tab.c FILEStest_yacc+= calc3.tab.h FILEStest_yacc+= code_calc.code.c FILEStest_yacc+= code_calc.error FILEStest_yacc+= code_calc.output FILEStest_yacc+= code_calc.tab.c FILEStest_yacc+= code_calc.tab.h FILEStest_yacc+= code_error.code.c FILEStest_yacc+= code_error.error FILEStest_yacc+= code_error.output FILEStest_yacc+= code_error.tab.c FILEStest_yacc+= code_error.tab.h FILEStest_yacc+= empty.error FILEStest_yacc+= empty.output FILEStest_yacc+= empty.tab.c FILEStest_yacc+= empty.tab.h FILEStest_yacc+= err_syntax1.error FILEStest_yacc+= err_syntax1.output FILEStest_yacc+= err_syntax1.tab.c FILEStest_yacc+= err_syntax1.tab.h FILEStest_yacc+= err_syntax10.error FILEStest_yacc+= err_syntax10.output FILEStest_yacc+= err_syntax10.tab.c FILEStest_yacc+= err_syntax10.tab.h FILEStest_yacc+= err_syntax11.error FILEStest_yacc+= err_syntax11.output FILEStest_yacc+= err_syntax11.tab.c FILEStest_yacc+= err_syntax11.tab.h FILEStest_yacc+= err_syntax12.error FILEStest_yacc+= err_syntax12.output FILEStest_yacc+= err_syntax12.tab.c FILEStest_yacc+= err_syntax12.tab.h FILEStest_yacc+= err_syntax13.error FILEStest_yacc+= err_syntax13.output FILEStest_yacc+= err_syntax13.tab.c FILEStest_yacc+= err_syntax13.tab.h FILEStest_yacc+= err_syntax14.error FILEStest_yacc+= err_syntax14.output FILEStest_yacc+= err_syntax14.tab.c FILEStest_yacc+= err_syntax14.tab.h FILEStest_yacc+= err_syntax15.error FILEStest_yacc+= err_syntax15.output FILEStest_yacc+= err_syntax15.tab.c FILEStest_yacc+= err_syntax15.tab.h FILEStest_yacc+= err_syntax16.error FILEStest_yacc+= err_syntax16.output FILEStest_yacc+= err_syntax16.tab.c FILEStest_yacc+= err_syntax16.tab.h FILEStest_yacc+= err_syntax17.error FILEStest_yacc+= err_syntax17.output FILEStest_yacc+= err_syntax17.tab.c FILEStest_yacc+= err_syntax17.tab.h FILEStest_yacc+= err_syntax18.error FILEStest_yacc+= err_syntax18.output FILEStest_yacc+= err_syntax18.tab.c FILEStest_yacc+= err_syntax18.tab.h FILEStest_yacc+= err_syntax19.error FILEStest_yacc+= err_syntax19.output FILEStest_yacc+= err_syntax19.tab.c FILEStest_yacc+= err_syntax19.tab.h FILEStest_yacc+= err_syntax2.error FILEStest_yacc+= err_syntax2.output FILEStest_yacc+= err_syntax2.tab.c FILEStest_yacc+= err_syntax2.tab.h FILEStest_yacc+= err_syntax20.error FILEStest_yacc+= err_syntax20.output FILEStest_yacc+= err_syntax20.tab.c FILEStest_yacc+= err_syntax20.tab.h FILEStest_yacc+= err_syntax21.error FILEStest_yacc+= err_syntax21.output FILEStest_yacc+= err_syntax21.tab.c FILEStest_yacc+= err_syntax21.tab.h FILEStest_yacc+= err_syntax22.error FILEStest_yacc+= err_syntax22.output FILEStest_yacc+= err_syntax22.tab.c FILEStest_yacc+= err_syntax22.tab.h FILEStest_yacc+= err_syntax23.error FILEStest_yacc+= err_syntax23.output FILEStest_yacc+= err_syntax23.tab.c FILEStest_yacc+= err_syntax23.tab.h FILEStest_yacc+= err_syntax24.error FILEStest_yacc+= err_syntax24.output FILEStest_yacc+= err_syntax24.tab.c FILEStest_yacc+= err_syntax24.tab.h FILEStest_yacc+= err_syntax25.error FILEStest_yacc+= err_syntax25.output FILEStest_yacc+= err_syntax25.tab.c FILEStest_yacc+= err_syntax25.tab.h FILEStest_yacc+= err_syntax26.error FILEStest_yacc+= err_syntax26.output FILEStest_yacc+= err_syntax26.tab.c FILEStest_yacc+= err_syntax26.tab.h FILEStest_yacc+= err_syntax27.error FILEStest_yacc+= err_syntax27.output FILEStest_yacc+= err_syntax27.tab.c FILEStest_yacc+= err_syntax27.tab.h FILEStest_yacc+= err_syntax3.error FILEStest_yacc+= err_syntax3.output FILEStest_yacc+= err_syntax3.tab.c FILEStest_yacc+= err_syntax3.tab.h FILEStest_yacc+= err_syntax4.error FILEStest_yacc+= err_syntax4.output FILEStest_yacc+= err_syntax4.tab.c FILEStest_yacc+= err_syntax4.tab.h FILEStest_yacc+= err_syntax5.error FILEStest_yacc+= err_syntax5.output FILEStest_yacc+= err_syntax5.tab.c FILEStest_yacc+= err_syntax5.tab.h FILEStest_yacc+= err_syntax6.error FILEStest_yacc+= err_syntax6.output FILEStest_yacc+= err_syntax6.tab.c FILEStest_yacc+= err_syntax6.tab.h FILEStest_yacc+= err_syntax7.error FILEStest_yacc+= err_syntax7.output FILEStest_yacc+= err_syntax7.tab.c FILEStest_yacc+= err_syntax7.tab.h FILEStest_yacc+= err_syntax7a.error FILEStest_yacc+= err_syntax7a.output FILEStest_yacc+= err_syntax7a.tab.c FILEStest_yacc+= err_syntax7a.tab.h FILEStest_yacc+= err_syntax7b.error FILEStest_yacc+= err_syntax7b.output FILEStest_yacc+= err_syntax7b.tab.c FILEStest_yacc+= err_syntax7b.tab.h FILEStest_yacc+= err_syntax8.error FILEStest_yacc+= err_syntax8.output FILEStest_yacc+= err_syntax8.tab.c FILEStest_yacc+= err_syntax8.tab.h FILEStest_yacc+= err_syntax8a.error FILEStest_yacc+= err_syntax8a.output FILEStest_yacc+= err_syntax8a.tab.c FILEStest_yacc+= err_syntax8a.tab.h FILEStest_yacc+= err_syntax9.error FILEStest_yacc+= err_syntax9.output FILEStest_yacc+= err_syntax9.tab.c FILEStest_yacc+= err_syntax9.tab.h FILEStest_yacc+= error.error FILEStest_yacc+= error.output FILEStest_yacc+= error.tab.c FILEStest_yacc+= error.tab.h FILEStest_yacc+= grammar.dot FILEStest_yacc+= grammar.error FILEStest_yacc+= grammar.output FILEStest_yacc+= grammar.tab.c FILEStest_yacc+= grammar.tab.h FILEStest_yacc+= help.error FILEStest_yacc+= help.output FILEStest_yacc+= no_b_opt.error FILEStest_yacc+= no_b_opt.output FILEStest_yacc+= no_b_opt1.error FILEStest_yacc+= no_b_opt1.output FILEStest_yacc+= no_code_c.error FILEStest_yacc+= no_code_c.output FILEStest_yacc+= no_defines.error FILEStest_yacc+= no_defines.output FILEStest_yacc+= no_graph.error FILEStest_yacc+= no_graph.output FILEStest_yacc+= no_include.error FILEStest_yacc+= no_include.output FILEStest_yacc+= no_opts.error FILEStest_yacc+= no_opts.output FILEStest_yacc+= no_output.error FILEStest_yacc+= no_output.output FILEStest_yacc+= no_output1.error FILEStest_yacc+= no_output1.output FILEStest_yacc+= no_output2.error FILEStest_yacc+= no_output2.output FILEStest_yacc+= no_p_opt.error FILEStest_yacc+= no_p_opt.output FILEStest_yacc+= no_p_opt1.error FILEStest_yacc+= no_p_opt1.output FILEStest_yacc+= no_verbose.error FILEStest_yacc+= no_verbose.output FILEStest_yacc+= nostdin.error FILEStest_yacc+= nostdin.output FILEStest_yacc+= ok_syntax1.error FILEStest_yacc+= ok_syntax1.output FILEStest_yacc+= ok_syntax1.tab.c FILEStest_yacc+= ok_syntax1.tab.h FILEStest_yacc+= pure_calc.error FILEStest_yacc+= pure_calc.output FILEStest_yacc+= pure_calc.tab.c FILEStest_yacc+= pure_calc.tab.h FILEStest_yacc+= pure_error.error FILEStest_yacc+= pure_error.output FILEStest_yacc+= pure_error.tab.c FILEStest_yacc+= pure_error.tab.h FILEStest_yacc+= quote_calc-s.error FILEStest_yacc+= quote_calc-s.output FILEStest_yacc+= quote_calc-s.tab.c FILEStest_yacc+= quote_calc-s.tab.h FILEStest_yacc+= quote_calc.error FILEStest_yacc+= quote_calc.output FILEStest_yacc+= quote_calc.tab.c FILEStest_yacc+= quote_calc.tab.h FILEStest_yacc+= quote_calc2-s.error FILEStest_yacc+= quote_calc2-s.output FILEStest_yacc+= quote_calc2-s.tab.c FILEStest_yacc+= quote_calc2-s.tab.h FILEStest_yacc+= quote_calc2.error FILEStest_yacc+= quote_calc2.output FILEStest_yacc+= quote_calc2.tab.c FILEStest_yacc+= quote_calc2.tab.h FILEStest_yacc+= quote_calc3-s.error FILEStest_yacc+= quote_calc3-s.output FILEStest_yacc+= quote_calc3-s.tab.c FILEStest_yacc+= quote_calc3-s.tab.h FILEStest_yacc+= quote_calc3.error FILEStest_yacc+= quote_calc3.output FILEStest_yacc+= quote_calc3.tab.c FILEStest_yacc+= quote_calc3.tab.h FILEStest_yacc+= quote_calc4-s.error FILEStest_yacc+= quote_calc4-s.output FILEStest_yacc+= quote_calc4-s.tab.c FILEStest_yacc+= quote_calc4-s.tab.h FILEStest_yacc+= quote_calc4.error FILEStest_yacc+= quote_calc4.output FILEStest_yacc+= quote_calc4.tab.c FILEStest_yacc+= quote_calc4.tab.h FILEStest_yacc+= rename_debug.c FILEStest_yacc+= rename_debug.error FILEStest_yacc+= rename_debug.h FILEStest_yacc+= rename_debug.i FILEStest_yacc+= rename_debug.output FILEStest_yacc+= varsyntax_calc1.error FILEStest_yacc+= varsyntax_calc1.output FILEStest_yacc+= varsyntax_calc1.tab.c FILEStest_yacc+= varsyntax_calc1.tab.h .include Index: head/usr.sbin/chown/tests/Makefile =================================================================== --- head/usr.sbin/chown/tests/Makefile (revision 299093) +++ head/usr.sbin/chown/tests/Makefile (revision 299094) @@ -1,13 +1,9 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TESTSDIR= ${TESTSBASE}/bin/chown TAP_TESTS_SH= chown-f_test .include Index: head/usr.sbin/etcupdate/tests/Makefile =================================================================== --- head/usr.sbin/etcupdate/tests/Makefile (revision 299093) +++ head/usr.sbin/etcupdate/tests/Makefile (revision 299094) @@ -1,19 +1,15 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ fbsdid_test \ ignore_test \ preworld_test \ tests_test \ tzsetup_test PLAIN_TESTS_SH+= ${test} TEST_METADATA.${test}+= required_user="root" .endfor .include Index: head/usr.sbin/extattr/tests/Makefile =================================================================== --- head/usr.sbin/extattr/tests/Makefile (revision 299093) +++ head/usr.sbin/extattr/tests/Makefile (revision 299094) @@ -1,9 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH= extattr_test .include Index: head/usr.sbin/fstyp/tests/Makefile =================================================================== --- head/usr.sbin/fstyp/tests/Makefile (revision 299093) +++ head/usr.sbin/fstyp/tests/Makefile (revision 299094) @@ -1,17 +1,14 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= fstyp_test -FILES= ext2.img.bz2 -FILES+= ext3.img.bz2 -FILES+= ext4.img.bz2 -FILES+= ext4_with_label.img.bz2 -FILES+= ntfs.img.bz2 -FILES+= ntfs_with_label.img.bz2 -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= ext2.img.bz2 +${PACKAGE}FILES+= ext3.img.bz2 +${PACKAGE}FILES+= ext4.img.bz2 +${PACKAGE}FILES+= ext4_with_label.img.bz2 +${PACKAGE}FILES+= ntfs.img.bz2 +${PACKAGE}FILES+= ntfs_with_label.img.bz2 .include Index: head/usr.sbin/makefs/tests/Makefile =================================================================== --- head/usr.sbin/makefs/tests/Makefile (revision 299093) +++ head/usr.sbin/makefs/tests/Makefile (revision 299094) @@ -1,21 +1,18 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - ATF_TESTS_SH+= makefs_cd9660_tests ATF_TESTS_SH+= makefs_ffs_tests BINDIR= ${TESTSDIR} +# XXX: PACKAGE support for SCRIPTS SCRIPTS+= makefs_tests_common.sh SCRIPTSNAME_makefs_tests_common.sh= makefs_tests_common.sh TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" .for t in ${ATF_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor .include Index: head/usr.sbin/newsyslog/tests/Makefile =================================================================== --- head/usr.sbin/newsyslog/tests/Makefile (revision 299093) +++ head/usr.sbin/newsyslog/tests/Makefile (revision 299094) @@ -1,9 +1,5 @@ # $FreeBSD$ -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - TAP_TESTS_SH= legacy_test .include Index: head/usr.sbin/nmtree/tests/Makefile =================================================================== --- head/usr.sbin/nmtree/tests/Makefile (revision 299093) +++ head/usr.sbin/nmtree/tests/Makefile (revision 299094) @@ -1,34 +1,31 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} + TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree .PATH: ${TESTSRC} ATF_TESTS_SH= nmtree_test ATF_TESTS_SH_SRC_nmtree_test= t_mtree.sh -FILESDIR= ${TESTSDIR} - # NOTE: the output from FreeBSD's nmtree displays sha256digest instead of # sha256; we need to mangle the specfiles to reflect this. .for f in mtree_d_create.out netbsd6_d_create.out CLEANFILES+= $f $f.tmp -FILES+= $f +${PACKAGE}FILES+= $f $f: ${TESTSRC}/$f sed -e 's/sha256/sha256digest/g' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor -FILES+= d_convert.in -FILES+= d_convert_C.out -FILES+= d_convert_C_S.out -FILES+= d_convert_D.out -FILES+= d_convert_D_S.out -FILES+= d_merge.in -FILES+= d_merge_C_M.out -FILES+= d_merge_C_M_S.out +${PACKAGE}FILES+= d_convert.in +${PACKAGE}FILES+= d_convert_C.out +${PACKAGE}FILES+= d_convert_C_S.out +${PACKAGE}FILES+= d_convert_D.out +${PACKAGE}FILES+= d_convert_D_S.out +${PACKAGE}FILES+= d_merge.in +${PACKAGE}FILES+= d_merge_C_M.out +${PACKAGE}FILES+= d_merge_C_M_S.out .include Index: head/usr.sbin/pw/tests/Makefile =================================================================== --- head/usr.sbin/pw/tests/Makefile (revision 299093) +++ head/usr.sbin/pw/tests/Makefile (revision 299094) @@ -1,26 +1,26 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} ATF_TESTS_SH= pw_etcdir \ pw_lock \ pw_config \ pw_groupadd \ pw_groupdel \ pw_groupmod \ pw_useradd \ pw_userdel \ pw_usermod \ pw_usernext .for tp in ${ATF_TESTS_SH} TEST_METADATA.${tp}+= required_user="root" .endfor -FILES= group helper_functions.shin master.passwd pw.conf \ - pw-modified.conf -FILESDIR= ${TESTSDIR} +${PACKAGE}FILES+= group +${PACKAGE}FILES+= helper_functions.shin +${PACKAGE}FILES+= master.passwd +${PACKAGE}FILES+= pw.conf +${PACKAGE}FILES+= pw-modified.conf .include Index: head/usr.sbin/rpcbind/tests/Makefile =================================================================== --- head/usr.sbin/rpcbind/tests/Makefile (revision 299093) +++ head/usr.sbin/rpcbind/tests/Makefile (revision 299094) @@ -1,21 +1,17 @@ # $FreeBSD$ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} - .PATH: ${.CURDIR}/.. ATF_TESTS_C= addrmerge_test CFLAGS+= -I${.CURDIR}/.. -Wno-cast-qual SRCS.addrmerge_test= addrmerge_test.c util.c .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif WARNS?= 3 .include Index: head/usr.sbin/sa/tests/Makefile =================================================================== --- head/usr.sbin/sa/tests/Makefile (revision 299093) +++ head/usr.sbin/sa/tests/Makefile (revision 299094) @@ -1,35 +1,32 @@ # $FreeBSD$ PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TAP_TESTS_SH= legacy_test -FILESDIR= ${TESTSDIR} -FILES= v1-amd64-sav.in -FILES+= v1-amd64-sav.out -FILES+= v1-amd64-u.out -FILES+= v1-amd64-usr.in -FILES+= v1-amd64-usr.out -FILES+= v1-i386-sav.in -FILES+= v1-i386-sav.out -FILES+= v1-i386-u.out -FILES+= v1-i386-usr.in -FILES+= v1-i386-usr.out -FILES+= v1-sparc64-sav.in -FILES+= v1-sparc64-sav.out -FILES+= v1-sparc64-u.out -FILES+= v1-sparc64-usr.in -FILES+= v1-sparc64-usr.out -FILES+= v2-amd64-sav.in -FILES+= v2-amd64-u.out -FILES+= v2-amd64-usr.in -FILES+= v2-i386-sav.in -FILES+= v2-i386-u.out -FILES+= v2-i386-usr.in -FILES+= v2-sparc64-sav.in -FILES+= v2-sparc64-u.out -FILES+= v2-sparc64-usr.in +${PACKAGE}FILES+= v1-amd64-sav.in +${PACKAGE}FILES+= v1-amd64-sav.out +${PACKAGE}FILES+= v1-amd64-u.out +${PACKAGE}FILES+= v1-amd64-usr.in +${PACKAGE}FILES+= v1-amd64-usr.out +${PACKAGE}FILES+= v1-i386-sav.in +${PACKAGE}FILES+= v1-i386-sav.out +${PACKAGE}FILES+= v1-i386-u.out +${PACKAGE}FILES+= v1-i386-usr.in +${PACKAGE}FILES+= v1-i386-usr.out +${PACKAGE}FILES+= v1-sparc64-sav.in +${PACKAGE}FILES+= v1-sparc64-sav.out +${PACKAGE}FILES+= v1-sparc64-u.out +${PACKAGE}FILES+= v1-sparc64-usr.in +${PACKAGE}FILES+= v1-sparc64-usr.out +${PACKAGE}FILES+= v2-amd64-sav.in +${PACKAGE}FILES+= v2-amd64-u.out +${PACKAGE}FILES+= v2-amd64-usr.in +${PACKAGE}FILES+= v2-i386-sav.in +${PACKAGE}FILES+= v2-i386-u.out +${PACKAGE}FILES+= v2-i386-usr.in +${PACKAGE}FILES+= v2-sparc64-sav.in +${PACKAGE}FILES+= v2-sparc64-u.out +${PACKAGE}FILES+= v2-sparc64-usr.in .include Index: head/usr.sbin/tests/Makefile =================================================================== --- head/usr.sbin/tests/Makefile (revision 299093) +++ head/usr.sbin/tests/Makefile (revision 299094) @@ -1,14 +1,6 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head =================================================================== --- head (revision 299093) +++ head (revision 299094) Property changes on: head ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /user/ngie/release-pkg-fix-tests:r298865-299093