Page MenuHomeFreeBSD

D59030.1795000085.diff
No OneTemporary

Authored By
Unknown
Size
46 KB
Referenced Files
None
Subscribers
None

D59030.1795000085.diff

diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.rax.d \
tst.uregsarray.d \
@@ -14,5 +14,7 @@
CFILES= \
tst.rax.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_AGG_FUNC.bad.d \
err.D_AGG_MDIM.bad.d \
err.D_AGG_NULL.bad.d \
@@ -187,5 +187,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DIV_ZERO.divby0.d \
err.D_DIV_ZERO.divby0_1.d \
err.D_DIV_ZERO.divby0_2.d \
@@ -28,5 +28,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ARR_BADREF.bad.d \
err.D_DECL_ARRBIG.toobig.d \
err.D_DECL_ARRNULL.bad.d \
@@ -25,5 +25,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_OP_INCOMPAT.dupgtype.d \
err.D_OP_INCOMPAT.dupttype.d \
err.D_OP_INCOMPAT.this.d \
@@ -28,5 +28,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.begin.d \
err.D_PDESC_ZERO.tick.d \
tst.begin.d \
@@ -18,5 +18,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ADDROF_BITFIELD.BitfieldAddress.d \
err.D_DECL_BFCONST.NegBitField.d \
err.D_DECL_BFCONST.ZeroBitField.d \
@@ -22,5 +22,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.end.d \
err.resize1.d \
err.resize2.d \
@@ -33,5 +33,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_XLATE_NOCONV.cpuusage.d \
err.D_XLATE_NOCONV.nice.d \
err.D_XLATE_NOCONV.priority.d \
@@ -44,5 +44,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_NOREG.noreg.d \
err.baddif.d \
@@ -14,5 +14,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_IDENT_UNDEF.aggfun.d \
err.D_IDENT_UNDEF.aggtup.d \
err.D_IDENT_UNDEF.arrtup.d \
@@ -22,5 +22,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.lowfrequency.d \
err.D_PDESC_ZERO.malformedoverflow.d \
err.D_PDESC_ZERO.nonexistentevent.d \
@@ -23,5 +23,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DECL_LOCASSC.NonLocalAssoc.d \
err.D_DECL_LONGINT.LongStruct.d \
err.D_DECL_PARMCLASS.BadStorageClass.d \
@@ -26,5 +26,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
badptr.d \
countdown.d \
counter.d \
@@ -28,5 +28,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
drp.DTRACEDROP_AGGREGATION.d \
drp.DTRACEDROP_DBLERROR.d \
drp.DTRACEDROP_DYNAMIC.d \
@@ -20,5 +20,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.InvalidDescription1.d \
man.APIVersion.d \
man.AddSearchPath.d \
@@ -114,5 +114,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_IDENT_UNDEF.timespent.d \
tst.end.d \
tst.endwithoutbegin.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DECL_IDRED.EnumSameName.d \
err.D_UNKNOWN.RepeatIdentifiers.d \
tst.EnumEquality.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/env/Makefile b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/env/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRAGMA_OPTSET.setfromscript.d \
err.D_PRAGMA_OPTSET.unsetfromscript.d \
tst.ld_nolazyload.ksh \
@@ -26,5 +26,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.DTRACEFLT_BADADDR.d \
tst.DTRACEFLT_DIVZERO.d \
tst.DTRACEFLT_UNKNOWN.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PROTO_LEN.noarg.d \
err.exitarg1.d \
tst.basic1.d \
@@ -15,5 +15,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.notreturn.d \
tst.argtest.ksh \
tst.argtest.ksh.out \
@@ -24,5 +24,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_FUNC_UNDEF.progenyofbad1.d \
err.D_OP_VFPTR.badop.d \
err.D_PROTO_ARG.chillbadarg.d \
@@ -109,5 +109,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ADDROF_LVAL.d \
err.D_EMPTY.empty.d \
tst.clauses.d \
@@ -16,5 +16,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.includefirst.ksh \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DECL_IDRED.redef1.d \
err.D_DECL_IDRED.redef2.d \
err.D_IDENT_UNDEF.recur.d \
@@ -24,5 +24,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.fds.d \
tst.fds.d.out \
@@ -14,5 +14,7 @@
CFILES= \
tst.fds.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.ipv4localicmp.ksh \
tst.ipv4localicmp.ksh.out \
tst.ipv4localsctp.ksh \
@@ -44,5 +44,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.Abort.ksh \
tst.Abort.ksh.out \
tst.Bean.ksh \
@@ -40,5 +40,7 @@
tst.FunctionLookup.c \
tst.ProbeData.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.general.d \
tst.general.d.out \
tst.strsize.d \
@@ -19,5 +19,7 @@
CFILES= \
tst.usdt.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.basic.ksh \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_CHR_NL.char.d \
err.D_CHR_NULL.char.d \
err.D_INT_DIGIT.InvalidDigit.d \
@@ -26,5 +26,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_LLQUANT_FACTOREVEN.nodivide.d \
err.D_LLQUANT_FACTOREVEN.notfactor.d \
err.D_LLQUANT_FACTORMATCH.d \
@@ -47,5 +47,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.dtracedcmd.ksh \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.icmp.ksh \
tst.tcp.ksh \
tst.udp.ksh \
@@ -15,5 +15,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRAGMA_OPTSET.d \
tst.badopt.d \
tst.boolopt.d \
@@ -26,5 +26,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRINTA_AGGKEY.d \
err.D_PRINTA_AGGPROTO.d \
tst.many.d \
@@ -30,5 +30,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.call.d \
tst.call3.d \
@@ -15,5 +15,7 @@
tst.call.c \
tst.call3.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_OFFSETOF_BITFIELD.bitfield.d \
err.D_OFFSETOF_TYPE.badtype.d \
err.D_OFFSETOF_TYPE.notsou.d \
@@ -24,5 +24,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.agg.avg.ksh \
tst.agg.count.ksh \
tst.agg.llquantize.ksh \
@@ -38,5 +38,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.ternary.d \
tst.ternary.d.out \
@@ -14,5 +14,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.badlib.d \
err.D_PDESC_ZERO.badproc1.d \
err.D_PROC_BADPID.badproc2.d \
@@ -65,5 +65,7 @@
tst.weak1.c \
tst.weak2.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.available.d \
tst.libmap.d \
@@ -15,5 +15,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.BadAlign.d \
err.D_ADDROF_VAR.ArrayVar.d \
err.D_ADDROF_VAR.DynamicVar.d \
@@ -44,5 +44,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRAGERR.d \
err.D_PRAGMA_DEPEND.main.d \
err.D_PRAGMA_INVAL.d \
@@ -26,5 +26,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRED_SCALAR.NonScalarPred.d \
err.D_SYNTAX.invalid.d \
err.D_SYNTAX.operr.d \
@@ -21,5 +21,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_IDENT_UNDEF.afterprobe.d \
err.D_PRAGCTL_INVAL.tabdefine.d \
err.D_SYNTAX.withoutpound.d \
@@ -49,5 +49,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRINT_AGG.bad.d \
err.D_PRINT_VOID.bad.d \
err.D_PROTO_LEN.bad.d \
@@ -28,5 +28,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRINTA_AGGARG.badagg.d \
err.D_PRINTA_AGGARG.badfmt.d \
err.D_PRINTA_AGGARG.badval.d \
@@ -36,5 +36,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PRINTF_AGG_CONV.aggfmt.d \
err.D_PRINTF_ARG_EXTRA.toomany.d \
err.D_PRINTF_ARG_EXTRA.widths.d \
@@ -64,5 +64,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.fds.ksh \
tst.func_access.ksh \
tst.getf.ksh \
@@ -20,5 +20,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.probeqtn.d \
err.D_PDESC_ZERO.probestar.d \
err.D_PDESC_ZERO.tickstar.d \
@@ -32,5 +32,7 @@
CFILES= \
tst.probestar.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.create.ksh \
tst.discard.ksh \
tst.exec.ksh \
@@ -24,6 +24,8 @@
tst.exitcore.c \
tst.sigwait.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
LIBADD.tst.sigwait.exe+= rt
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.profile.d \
err.D_PDESC_ZEROonens.d \
err.D_PDESC_ZEROonensec.d \
@@ -50,5 +50,7 @@
CFILES= \
tst.ufuncsort.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_INVAL.wrongdec4.d \
err.D_PDESC_ZERO.nonprofile.d \
err.D_PDESC_ZERO.wrongdec1.d \
@@ -40,5 +40,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.raise1.d \
tst.raise2.d \
tst.raise3.d \
@@ -17,6 +17,8 @@
tst.raise2.c \
tst.raise3.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
TEST_METADATA.t_dtrace_contrib+= required_memory="4g"
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.aggrate.d \
tst.aggrate.d.out \
tst.statusrate.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.basename.d \
tst.caller.d \
tst.cleanpath.d \
@@ -52,6 +52,8 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
TEST_METADATA.t_dtrace_contrib+= required_memory="4g"
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ARR_LOCAL.thisarray.d \
err.D_DECL_CLASS.selfthis.d \
err.D_DECL_CLASS.thisself.d \
@@ -35,5 +35,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.enqueue.d \
tst.oncpu.d \
tst.stackdepth.d \
@@ -15,5 +15,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_MACRO_UNDEF.invalidargs.d \
err.D_OP_LVAL.rdonly.d \
err.D_OP_WRITE.usepidmacro.d \
@@ -45,5 +45,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.sdtargs.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
tst.sdtargs.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_IDENT_BADREF.SizeofAssoc.d \
err.D_IDENT_UNDEF.UnknownSymbol.d \
err.D_SIZEOF_TYPE.badstruct.d \
@@ -27,5 +27,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
bug.1001148.SpecSizeVariations.d \
err.BufSizeVariations1.d \
err.BufSizeVariations2.d \
@@ -71,5 +71,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ATTR_MIN.MinAttributes.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_STACK_PROTO.bad.d \
err.D_STACK_SIZE.d \
err.D_USTACK_FRAMES.bad.d \
@@ -18,5 +18,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.default.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.stop1.d \
tst.stop2.d \
@@ -15,5 +15,7 @@
tst.stop1.c \
tst.stop2.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.strlen1.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.BaseTooLarge.d \
err.BaseTooSmall.d \
tst.strtoll.d \
@@ -16,5 +16,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ADDROF_VAR.StructPointer.d \
err.D_DECL_COMBO.StructWithoutColon.d \
err.D_DECL_COMBO.StructWithoutColon1.d \
@@ -27,5 +27,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.else.d \
tst.if.d \
tst.if2.d \
@@ -19,5 +19,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.args.d \
tst.openret.ksh \
@@ -14,5 +14,7 @@
CFILES= \
tst.args.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.post.d \
tst.post_chan.d \
@@ -15,5 +15,7 @@
tst.post.c \
tst.post_chan.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PDESC_ZERO.tick.d \
err.D_PDESC_ZEROonens.d \
err.D_PDESC_ZEROonensec.d \
@@ -34,5 +34,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PROTO_LEN.bad.d \
err.D_TRACE_AGG.bad.d \
err.D_TRACE_VOID.bad.d \
@@ -20,5 +20,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_PROTO_ARG.badsize.d \
err.D_PROTO_LEN.toofew.d \
err.D_TRACEMEM_ADDR.badaddr.d \
@@ -22,5 +22,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DECL_TYPERED.BadTransDecl.d \
err.D_OP_INCOMPLETE.NonExistentInput1.d \
err.D_SYNTAX.BadTransDecl1.d \
@@ -47,5 +47,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_DECL_IDRED.DupTypeDef.d \
err.D_SYNTAX.BadExistingTypedef.d \
err.D_SYNTAX.TypedefInClause.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_CAST_INVAL.badcast.d \
err.D_CG_DYN.ResultDynType.d \
err.D_CHR_OFLOW.charconst.d \
@@ -65,5 +65,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.invalidpid.d \
err.invalidpid2.d \
err.invalidpid3.d \
@@ -35,6 +35,8 @@
tst.libtype.c \
tst.printtype.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
WITH_CTF=YES
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
err.D_ADDROF_VAR.UnionPointer.d \
err.D_DECL_COMBO.UnionWithoutColon.d \
err.D_DECL_COMBO.UnionWithoutColon1.d \
@@ -23,5 +23,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
argmap.d \
args.d \
forker.d \
@@ -63,5 +63,7 @@
tst.args.c \
tst.forker.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.bigstack.d \
tst.depth.ksh \
tst.spin.ksh \
@@ -16,5 +16,7 @@
tst.bigstack.c \
tst.spin.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.gid.d \
tst.nullassign.d \
tst.ppid.d \
@@ -19,5 +19,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.1.0.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
--- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
+++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
@@ -17,20 +17,22 @@
GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh
EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh
-${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${TFILES}
env TESTBASE=${TESTBASE:Q} \
- sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${PACKAGE}FILES:S/ */ /} > ${.TARGET}
+ sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${TFILES: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/}
+# Only precompile C files if they don't have a
+# corresponding D source. This prevents compiling
+# the D source for the host architecture in cross
+# builds.
+.for prog in ${CFILES:T:S/.c$/.exe/g}
+.if !exists(${prog:S/^tst.//:S/.exe$/.d/})
+PROGS+= ${prog}
+SRCS.${prog}+= ${prog:S/.exe$/.c/}
.endif
.endfor
diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.uregsarray.d \
TESTEXES= \
@@ -13,5 +13,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.badcopyin.d \
tst.badcopyinstr.d \
tst.badcopyout.d \
@@ -16,5 +16,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
tst.badinstr.d \
tst.branch.d \
tst.embedded.d \
@@ -17,5 +17,7 @@
CFILES= \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
@@ -4,7 +4,7 @@
PACKAGE= tests
-${PACKAGE}FILES= \
+TFILES= \
annotated_helper.d \
helper_helper.d \
tst.annotated.d \
@@ -20,5 +20,7 @@
tst.annotated.c \
tst.helper.c \
+${PACKAGE}FILES= ${TFILES} ${CFILES}
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
--- a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
@@ -22,7 +22,7 @@
runtest()
{
- local dflags exe exstatus pid retval status
+ local cfile ofile ddep odep dflags exe exstatus pid retval status
exstatus=0
retval=0
@@ -45,6 +45,28 @@
esac
exe=${TFILE%.*}.exe
+ cfile=${TFILE%.*}.c
+ ddep=${TFILE%.*}.d
+ ddep=${ddep#tst.}
+ if [ -r "$cfile" -a -r "$ddep" ]; then
+ # The tst.xxx.c corresponding to the tst.xxx.d is usually
+ # (cross-)compiled on the build host and installed in the target
+ # system as an executable. However, when there is an associated
+ # xxx.d file to be included in that executable, we must compile
+ # xxx.d in the target system at runtime because DTrace currently
+ # doesn't support cross-compilation and will always use the build
+ # host's ELF format when calling `dtrace -G`.
+ # TODO add support for cross-compilation in DTrace and move it back
+ # to dtrace.test.mk.
+ ofile="${cfile%.c}.o"
+ odep="${ddep%.d}.o"
+ dtrace -C -x nolibs -h -s "$ddep"
+ cc -O0 -g -I. -o "$ofile" -c "$cfile"
+ dtrace -C -x nolibs -G -s "$ddep" "$ofile"
+ cc -O0 -g -I. -o "$exe" "$ofile" "$odep"
+ rm -f "${ddep%.d}.h" "$ofile" "$odep"
+ fi
+
if [ -f "$exe" -a -x "$exe" ]; then
./$exe &
pid=$!
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -65,7 +65,7 @@
PACKAGE= tests
-\${PACKAGE}FILES= \\
+TFILES= \\
$tfiles
TESTEXES= \\
@@ -74,6 +74,8 @@
CFILES= \\
$tcfiles
+\${PACKAGE}FILES= \${TFILES} \${CFILES}
+
$special
.include "../../dtrace.test.mk"
__EOF__

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 18, 11:08 AM (20 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41822382
Default Alt Text
D59030.1795000085.diff (46 KB)

Event Timeline