diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
commit | 430f7286a566b1407c7b32ce13585caf5aa59b92 (patch) | |
tree | a3a2f2051c05cb9a95c4a94f6c5bbcd7a12cdfea /cddl/usr.sbin/dtrace | |
parent | e45163b2162def698a0320716097091257c39dea (diff) | |
download | src-430f7286a566b1407c7b32ce13585caf5aa59b92.tar.gz src-430f7286a566b1407c7b32ce13585caf5aa59b92.zip |
Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed
after r298107
Summary of changes:
- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
namespacing is kept with FILES appropriately, and that this shouldn't need
to be repeated if the namespace changes -- only the definition of PACKAGE
needs to be changed
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
`tests`. In the event we get to the point where things can be split up
enough in the base system, it would make more sense to group the tests
with the blocks they're a part of, e.g. byacc with byacc-tests, etc
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk.
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
and lib/libc/tests/net/getaddrinfo
- Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup)
Document the proposed changes in share/examples/tests/tests/... via examples
so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of
replacing FILES. share/mk/bsd.README didn't seem like the appropriate method
of communicating that info.
MFC after: never probably
X-MFC with: r298107
PR: 209114
Relnotes: yes
Tested with: buildworld, installworld, checkworld; buildworld, packageworld
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=299094
Diffstat (limited to 'cddl/usr.sbin/dtrace')
84 files changed, 251 insertions, 87 deletions
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile index 7db6f2fc0f76..ba5a7365840e 100644 --- a/cddl/usr.sbin/dtrace/tests/Makefile +++ b/cddl/usr.sbin/dtrace/tests/Makefile @@ -5,7 +5,7 @@ TESTS_SUBDIRS+= common .PATH: ${SRCTOP}/tests -KYUAFILE= YES +KYUAFILE= yes .PATH: ${.CURDIR}/tools SCRIPTSDIR= ${TESTSDIR} diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile index 24581921ad98..02201577bacb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile index f8f74f294b21..2abee2f8598e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile index 0e1cfe15d139..abbc48322795 100644 --- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile index 800dd88349b8..d7e64b8e4501 100644 --- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile index 1572a84c15c8..1c254bfe2958 100644 --- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile index 39c199b72f28..903e19262f73 100644 --- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile index f5b09bf8ed43..e9680e57088c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile index a36757213e92..962e8c9bddb8 100644 --- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile index c6c255195c43..e98af5191aea 100644 --- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile index ff6d01c01147..0e835239c35d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile index c86b69afae28..7b8e85d904e7 100644 --- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile index ea5950f50fbe..bd3bf7716feb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile index 3e6ca3d46bde..5ca7d0908fd7 100644 --- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile index 10b1eb5b9999..4f1973c69b26 100644 --- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile index 1ce004b8f708..dc77d8f0bc04 100644 --- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile index 951fed32a066..a05361ec4a39 100644 --- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile index 340858649dc9..9b78801d4c2f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile index e2f8bf90d12f..afd93dd222ee 100644 --- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile index 1129e0e6d5f2..3732caa83335 100644 --- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile index 9097defa59a8..c773b78ba795 100644 --- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile index b5a303542c2f..67d0b3cc4928 100644 --- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile index af5b19baaa0e..b9b94f2c6b35 100644 --- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile index a081ac11b1a5..d84f25bef30d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.includefirst.ksh \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile index db5fa63d0c9c..3a30b97d3cb6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile index 15a37f184a75..9075358230c4 100644 --- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile index 0aa648b58e71..805c31f6cde4 100644 --- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile index 67789020d286..7c7fdef9c008 100644 --- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile index b380f0f195a8..24400027c1e4 100644 --- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile index 583249373c41..d53872a0361b 100644 --- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile index cf9bbc9bebdc..be71bec5159e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile index 8102c7b8a0fa..26c26e7ba558 100644 --- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.dtracedcmd.ksh \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile index 862ddfc72533..ed799e68a879 100644 --- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile index 2e2e01759e33..87084ab5d593 100644 --- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile index 22ae12ae5503..2c0c4263a909 100644 --- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile index 4c765834ee9e..b50285991374 100644 --- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile index 204742fb73d1..2f56b12a035c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile index 08fdf2666ad3..daf530b93b62 100644 --- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile index 5228ae3d08ed..0b9fdeb8bb6e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile index a37635894ad7..57e30ed99036 100644 --- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile index 37e13831897d..af438aaaac2c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile index a595111c57e9..26b6920d0b0c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile index 267f4173a0cf..bd14b43757f6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile index 3685edfff0ed..f8b8917be205 100644 --- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile index 60d80ad73b43..af4e20e30557 100644 --- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile index 2404aa9975ac..8f5ac3613dcb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile index bda4ecf8a140..86cfdbbd5d9b 100644 --- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile index 858c53ddaf25..36f6106f8f96 100644 --- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile index 219973a0f8ac..8b8d779fe87e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile index d5653645b020..5ca083fc9431 100644 --- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile index 5065fe359cac..4e5a0157ecff 100644 --- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile index 650818cf6351..3972831ba5d5 100644 --- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile index 291419969359..cde512f2d21f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile index 6371e74a7932..bc9ab0a9d446 100644 --- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile index 1760f82dcc71..53260533b641 100644 --- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile index ece7045d8982..8a08eac05375 100644 --- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile index 5cdca4e910ba..d1bf42553346 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile index 9e52a5dfae28..1562629423ea 100644 --- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile index c52c9c9c76fd..ad0a43e4047e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.sdtargs.d \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile index df0d68b04048..021d0099b213 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile index c7193c2334e8..b5f6ae079e21 100644 --- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile index 939bf6559f0f..826202d4de3f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile @@ -4,7 +4,9 @@ # 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= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile index 5a01e94c3013..2fc1e8164dc6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile index 4b8f342af41a..e7beb43fa827 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.default.d \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile index 56fa9dab1a64..50a44bbd0a98 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile index af1e7d05e392..19937d3055eb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.strlen1.d \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile index e614138e059b..0ccc037d8bf3 100644 --- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile index 0b3ce40db6c6..35dd51a8067c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile index 795aeeb7eb36..f759b6bd398f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile index 1d612c53b0bf..d87b2bbaf042 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile index af494f9ce850..1800635351d7 100644 --- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile index 6f5e12ea1bee..19ff8e44230b 100644 --- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile index 67afa8491329..29b0ea26e691 100644 --- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile index 3722bf77b09a..6d38d1d63e36 100644 --- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile index dbc1f526bcbc..d3edcfd071ed 100644 --- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile index 7c65283194fc..89c2947f2632 100644 --- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile index 2746072bfb98..945a853b69df 100644 --- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile index bf3a28303cab..855869f05f04 100644 --- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile index b4f66239acd4..dd5571980d1d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile index 5acdf6d78ea3..6ea0621a0c29 100644 --- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile index a08a3ceafda3..bced0bf6da53 100644 --- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile @@ -4,7 +4,9 @@ # 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 \ diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile index 6c9da25a5127..3f1589f4249c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile @@ -4,7 +4,9 @@ # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # -TESTFILES= \ +PACKAGE= tests + +${PACKAGE}FILES= \ tst.1.0.d \ TESTEXES= \ diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk index 0c528eff5896..d49a503809f2 100644 --- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk +++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk @@ -1,14 +1,14 @@ # $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} @@ -17,7 +17,7 @@ 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 diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh index fda81fbc4d88..9953064bcd3e 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh @@ -52,7 +52,9 @@ WITH_CTF=YES # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh. # -TESTFILES= \\ +PACKAGE= tests + +\${PACKAGE}FILES= \\ $tfiles TESTEXES= \\ |