svn commit: r291332 - in head/cddl/usr.sbin/dtrace/tests: . common/aggs common/arithmetic common/arrays common/assocs common/begin common/bitfields common/buffering common/builtinvar common/cg comm...

Bryan Drewery bdrewery at FreeBSD.org
Wed Nov 25 20:43:55 UTC 2015


Author: bdrewery
Date: Wed Nov 25 20:43:45 2015
New Revision: 291332
URL: https://svnweb.freebsd.org/changeset/base/291332

Log:
  Rename Makefile.inc1 to dtrace.test.mk to avoid clash with top-level Makefile.inc1.
  
  Discussed with:	ngie, markj
  Sponsored by:	EMC / Isilon Storage Division

Added:
  head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
     - copied, changed from r291331, head/cddl/usr.sbin/dtrace/tests/Makefile.inc1
Deleted:
  head/cddl/usr.sbin/dtrace/tests/Makefile.inc1
Modified:
  head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/end/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/error/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/include/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/io/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/json/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/print/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/types/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/union/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/version/Makefile
  head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

Modified: head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -186,4 +186,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -26,4 +26,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -19,4 +19,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -34,4 +34,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -45,4 +45,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -15,4 +15,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -24,4 +24,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -115,4 +115,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/end/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/end/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/end/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/error/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/error/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/error/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -110,4 +110,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -17,4 +17,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/include/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/include/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/include/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -25,4 +25,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/io/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/io/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/io/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -15,4 +15,4 @@ CFILES= \
      tst.fds.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -33,4 +33,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -41,4 +41,4 @@ CFILES= \
      tst.ProbeData.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/json/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/json/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/json/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -20,4 +20,4 @@ CFILES= \
      tst.usdt.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -47,4 +47,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -31,4 +31,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
      tst.call3.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -25,4 +25,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -15,4 +15,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -66,4 +66,4 @@ CFILES= \
      tst.weak2.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -45,4 +45,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -22,4 +22,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -50,4 +50,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/print/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/print/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/print/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -37,4 +37,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -65,4 +65,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -33,4 +33,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -27,4 +27,4 @@ CFILES= \
 LDADD.tst.sigwait.exe+= -lrt
 DPADD.tst.sigwait.exe+= ${LIBRT}
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -50,4 +50,4 @@ CFILES= \
      tst.ufuncsort.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -41,4 +41,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
      tst.raise3.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -51,4 +51,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -34,4 +34,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -46,4 +46,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
      tst.sdtargs.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -28,4 +28,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -72,4 +72,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -19,4 +19,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
      tst.stop2.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -17,4 +17,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -28,4 +28,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -15,4 +15,4 @@ CFILES= \
      tst.args.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -16,4 +16,4 @@ CFILES= \
      tst.post_chan.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -35,4 +35,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -48,4 +48,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/types/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/types/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/types/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -66,4 +66,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -38,4 +38,4 @@ CFILES= \
 
 WITH_CTF=YES
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/union/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/union/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/union/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -24,4 +24,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -62,4 +62,4 @@ CFILES= \
      tst.forker.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -17,4 +17,4 @@ CFILES= \
      tst.spin.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -20,4 +20,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/version/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/version/Makefile	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/common/version/Makefile	Wed Nov 25 20:43:45 2015	(r291332)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Copied and modified: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (from r291331, head/cddl/usr.sbin/dtrace/tests/Makefile.inc1)
==============================================================================

Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed Nov 25 20:38:20 2015	(r291331)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed Nov 25 20:43:45 2015	(r291332)
@@ -63,7 +63,7 @@ CFILES= \\
 $tcfiles
 
 $special
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"
 __EOF__
 
     mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile


More information about the svn-src-all mailing list