git: 60d78908f57c - main - dtrace/tests: compile D sources at runtime on test target
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Sep 2026 19:05:59 UTC
The branch main has been updated by siva:
URL: https://cgit.FreeBSD.org/src/commit/?id=60d78908f57cf2100d5aeafa7db5d97cda3c5607
commit 60d78908f57cf2100d5aeafa7db5d97cda3c5607
Author: Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-09-02 18:09:48 +0000
Commit: Siva Mahadevan <siva@FreeBSD.org>
CommitDate: 2026-09-02 18:18:01 +0000
dtrace/tests: compile D sources at runtime on test target
Previously, we would precompile D test dependencies using the
host's dtrace, which unconditionally outputs ELF files in the
host's format. This breaks the cross-compile build with errors
like the following:
dtrace: failed to link script: incorrect ELF machine type for
object file: tst.usdt.pieo
--- usdt.o ---
*** Failed target: usdt.o
This patch moves compilation to runtime for all C-based testcases
that have a dependent D source file.
Reviewed by: markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D59030
---
cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/aggs/Makefile | 4 +++-
.../dtrace/tests/common/arithmetic/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/arrays/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/assocs/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/begin/Makefile | 4 +++-
.../dtrace/tests/common/bitfields/Makefile | 4 +++-
.../dtrace/tests/common/buffering/Makefile | 4 +++-
.../dtrace/tests/common/builtinvar/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/cg/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/clauses/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/cpc/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/decls/Makefile | 4 +++-
.../dtrace/tests/common/docsExamples/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/drops/Makefile | 4 +++-
.../dtrace/tests/common/dtraceUtil/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/end/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/enum/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/env/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/error/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/exit/Makefile | 4 +++-
.../dtrace/tests/common/fbtprovider/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/funcs/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/grammar/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/include/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/inline/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/io/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/ip/Makefile | 4 +++-
.../usr.sbin/dtrace/tests/common/java_api/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/json/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/kinst/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/lexer/Makefile | 4 +++-
.../dtrace/tests/common/llquantize/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/mdb/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/mib/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/misc/Makefile | 4 +++-
.../dtrace/tests/common/multiaggs/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/nfs/Makefile | 4 +++-
.../usr.sbin/dtrace/tests/common/offsetof/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/oformat/Makefile | 4 +++-
.../dtrace/tests/common/operators/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/pid/Makefile | 4 +++-
.../dtrace/tests/common/plockstat/Makefile | 4 +++-
.../usr.sbin/dtrace/tests/common/pointers/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/pragma/Makefile | 4 +++-
.../dtrace/tests/common/predicates/Makefile | 4 +++-
.../dtrace/tests/common/preprocessor/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/print/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/printa/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/printf/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/privs/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/probes/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/proc/Makefile | 4 +++-
.../dtrace/tests/common/profile-n/Makefile | 4 +++-
.../dtrace/tests/common/providers/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/raise/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/rates/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/safety/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/scalars/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/sched/Makefile | 4 +++-
.../dtrace/tests/common/scripting/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/sdt/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile | 4 +++-
.../dtrace/tests/common/speculation/Makefile | 4 +++-
.../dtrace/tests/common/stability/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/stack/Makefile | 4 +++-
.../dtrace/tests/common/stackdepth/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/stop/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/strlen/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/struct/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/sugar/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/syscall/Makefile | 4 +++-
.../usr.sbin/dtrace/tests/common/sysevent/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/trace/Makefile | 4 +++-
.../usr.sbin/dtrace/tests/common/tracemem/Makefile | 4 +++-
.../dtrace/tests/common/translators/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/typedef/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/types/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/uctf/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/union/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/usdt/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/ustack/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/vars/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/common/version/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/dtrace.test.mk | 18 ++++++++--------
cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/i386/pid/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile | 4 +++-
cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 24 +++++++++++++++++++++-
cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 4 +++-
93 files changed, 306 insertions(+), 100 deletions(-)
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
index d06cfb032f58..39a8ee502229 100644
--- 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 @@ TESTEXES= \
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
index 2ab9c05e2f80..caa79c02e936 100644
--- 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 @@ TESTEXES= \
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
index e7b8177f51f9..e334a218515b 100644
--- 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 @@ TESTEXES= \
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
index 04f64f07221c..6e44d85c50ea 100644
--- 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 @@ TESTEXES= \
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
index faee92dcfe00..d761f21309df 100644
--- 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 @@ TESTEXES= \
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
index 733f2f73fa19..86c804d1841b 100644
--- 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 @@ TESTEXES= \
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
index dc3637c7fd07..98cf07587f50 100644
--- 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 @@ TESTEXES= \
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
index f5e2f40cb1a8..122e3d2dd8f7 100644
--- 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 @@ TESTEXES= \
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
index a22dd3ea6d05..a0bcf08e600e 100644
--- 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 @@ TESTEXES= \
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
index 68baf9acd33b..9157b1932b65 100644
--- 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 @@ TESTEXES= \
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
index f72aa480efba..63a27fb9961f 100644
--- 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 @@ TESTEXES= \
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
index ec489bb094b6..36286274e4fc 100644
--- 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 @@ TESTEXES= \
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
index 6b8fb677d8a6..d4191dc4fa3f 100644
--- 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 @@ TESTEXES= \
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
index 1dae1ddb11b4..3374fce3e0af 100644
--- 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 @@ TESTEXES= \
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
index 87ed77eb0c2d..f00bd6397bbf 100644
--- 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 @@ TESTEXES= \
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
index 9371ab837a40..a372b47f4cfb 100644
--- 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 @@ TESTEXES= \
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
index 957a2290d250..40d9a54a312a 100644
--- 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 @@ TESTEXES= \
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
index b83f0251799b..e979c6e35e62 100644
--- 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 @@ TESTEXES= \
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
index 0d7ee4b975dd..8dde71b58356 100644
--- 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 @@ TESTEXES= \
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
index 7bf4f38b63bf..dea0d8a6b05a 100644
--- 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 @@ TESTEXES= \
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
index d58baea479c5..47ca341519c5 100644
--- 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 @@ TESTEXES= \
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
index 0dee8f807065..99a71b6db273 100644
--- 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 @@ TESTEXES= \
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
index 52bd1fc67ba7..be549f8bfebf 100644
--- 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 @@ TESTEXES= \
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
index 42cad7c69357..ad20763e5732 100644
--- 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 @@ TESTEXES= \
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
index 5e8a18816dfa..738dced6e246 100644
--- 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 @@ TESTEXES= \
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
index f21a46a7b41a..9af07e03a3b0 100644
--- 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 @@ TESTEXES= \
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
index e8af41d187da..57f17defb4f5 100644
--- 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 @@ TESTEXES= \
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
index e005b43d064d..048ac6bbbbb3 100644
--- 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 @@ TESTEXES= \
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
index e902c1bc4562..1012ff3813d4 100644
--- 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 @@ CFILES= \
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
index e3a0020149c2..75ec17461f84 100644
--- 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 @@ TESTEXES= \
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
index c683a5ce0700..0a5a752a51f9 100644
--- 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 @@ TESTEXES= \
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
index 8b7ec52c7f1f..31557ac96852 100644
--- 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 @@ TESTEXES= \
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
index e4bb476f0df7..4a7636ba44ba 100644
--- 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 @@ TESTEXES= \
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
index be8f66af0193..744787f13702 100644
--- 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 @@ TESTEXES= \
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
index b6d335b03f7e..ad5b3ad7354a 100644
--- 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 @@ TESTEXES= \
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
index bc96403cfe22..17e8d18956fa 100644
--- 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 @@ TESTEXES= \
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
index 16bb602627bb..0c446acdd217 100644
--- 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 @@ TESTEXES= \
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
index 81af106bce7d..43f85f5cc4dd 100644
--- 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 @@ CFILES= \
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
index 856f58d0afbd..ecbdf24c8b8e 100644
--- 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 @@ TESTEXES= \
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
index 219833285d0c..00f4d0257fca 100644
--- 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 @@ TESTEXES= \
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
index 6586e026fa0e..675b6e3e8bbd 100644
--- 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 @@ TESTEXES= \
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
*** 1131 LINES SKIPPED ***