Index: head/cddl/usr.sbin/dtrace/tests/Makefile.inc1 =================================================================== --- head/cddl/usr.sbin/dtrace/tests/Makefile.inc1 (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/Makefile.inc1 (nonexistent) @@ -1,48 +0,0 @@ -# $FreeBSD$ - -TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} -TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} - -FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE - -${TESTGROUP}= ${TESTFILES} -${TESTGROUP}EXE= ${TESTEXES} -${TESTGROUP}EXEMODE= 0555 - -TESTWRAPPER= t_dtrace_contrib -ATF_TESTS_SH+= ${TESTWRAPPER} -TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" -TEST_METADATA.t_dtrace_contrib+= required_user="root" - -GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh -EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh -${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}} - sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} - -CLEANFILES+= ${TESTWRAPPER}.sh - -.PATH: ${TESTSRC} - -PROGS= ${CFILES:T:S/.c$/.exe/g} -.for prog in ${PROGS} -SRCS.${prog}+= ${prog:S/.exe$/.c/} - -.if exists(${prog:S/^tst.//:S/.exe$/.d/}) -SRCS.${prog}+= ${prog:S/^tst.//:S/.exe$/.d/} -.endif -.endfor - -BINDIR= ${TESTSDIR} -MAN= - -# Some tests depend on the internals of their corresponding test programs, -# so make sure the optimizer doesn't interfere with them. -CFLAGS+= -O0 - -# Test programs shouldn't be stripped; else we generally can't use the PID -# provider. -DEBUG_FLAGS= -g -STRIP= - -.include Property changes on: head/cddl/usr.sbin/dtrace/tests/Makefile.inc1 ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile (revision 291332) @@ -1,189 +1,189 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_AGG_FUNC.bad.d \ err.D_AGG_MDIM.bad.d \ err.D_AGG_NULL.bad.d \ err.D_AGG_REDEF.redef.d \ err.D_AGG_SCALAR.avgtoofew.d \ err.D_AGG_SCALAR.maxnoarg.d \ err.D_AGG_SCALAR.mintoofew.d \ err.D_AGG_SCALAR.quantizetoofew.d \ err.D_AGG_SCALAR.stddevtoofew.d \ err.D_AGG_SCALAR.sumtoofew.d \ err.D_CLEAR_AGGARG.bad.d \ err.D_CLEAR_PROTO.bad.d \ err.D_FUNC_IDENT.bad.d \ err.D_FUNC_UNDEF.badaggfunc.d \ err.D_IDENT_UNDEF.badexpr.d \ err.D_IDENT_UNDEF.badkey3.d \ err.D_IDENT_UNDEF.noeffect.d \ err.D_KEY_TYPE.badkey1.d \ err.D_KEY_TYPE.badkey2.d \ err.D_KEY_TYPE.badkey4.d \ err.D_LQUANT_BASETYPE.lqbad1.d \ err.D_LQUANT_BASETYPE.lqshort.d \ err.D_LQUANT_BASEVAL.bad.d \ err.D_LQUANT_LIMTYPE.lqbad1.d \ err.D_LQUANT_LIMVAL.bad.d \ err.D_LQUANT_MATCHBASE.d \ err.D_LQUANT_MATCHBASE.order.d \ err.D_LQUANT_MATCHLIM.d \ err.D_LQUANT_MATCHLIM.order.d \ err.D_LQUANT_MATCHSTEP.d \ err.D_LQUANT_MISMATCH.lqbadarg.d \ err.D_LQUANT_STEPLARGE.lqtoofew.d \ err.D_LQUANT_STEPSMALL.bad.d \ err.D_LQUANT_STEPTYPE.lqbadinc.d \ err.D_LQUANT_STEPVAL.bad.d \ err.D_NORMALIZE_AGGARG.bad.d \ err.D_NORMALIZE_PROTO.bad.d \ err.D_NORMALIZE_SCALAR.bad.d \ err.D_PROTO_ARG.lquantizetoofew.d \ err.D_PROTO_LEN.avgnoarg.d \ err.D_PROTO_LEN.avgtoomany.d \ err.D_PROTO_LEN.counttoomany.d \ err.D_PROTO_LEN.lquantizenoarg.d \ err.D_PROTO_LEN.lquantizetoomany.d \ err.D_PROTO_LEN.maxnoarg.d \ err.D_PROTO_LEN.maxtoomany.d \ err.D_PROTO_LEN.minnoarg.d \ err.D_PROTO_LEN.mintoomany.d \ err.D_PROTO_LEN.quantizenoarg.d \ err.D_PROTO_LEN.quantizetoomany.d \ err.D_PROTO_LEN.stddevnoarg.d \ err.D_PROTO_LEN.stddevtoomany.d \ err.D_PROTO_LEN.sumnoarg.d \ err.D_PROTO_LEN.sumtoomany.d \ err.D_TRUNC_AGGARG.bad.d \ err.D_TRUNC_PROTO.badmany.d \ err.D_TRUNC_PROTO.badnone.d \ err.D_TRUNC_SCALAR.bad.d \ tst.aggencoding.d \ tst.aggencoding.d.out \ tst.agghist.d \ tst.agghist.d.out \ tst.aggpack.d \ tst.aggpack.d.out \ tst.aggpackbanner.ksh \ tst.aggpackbanner.ksh.out \ tst.aggpackzoom.d \ tst.aggpackzoom.d.out \ tst.aggzoom.d \ tst.aggzoom.d.out \ tst.allquant.d \ tst.allquant.d.out \ tst.avg.d \ tst.avg.d.out \ tst.avg_neg.d \ tst.avg_neg.d.out \ tst.clear.d \ tst.clear.d.out \ tst.clearavg.d \ tst.clearavg.d.out \ tst.clearavg2.d \ tst.clearavg2.d.out \ tst.cleardenormalize.d \ tst.cleardenormalize.d.out \ tst.clearlquantize.d \ tst.clearlquantize.d.out \ tst.clearnormalize.d \ tst.clearnormalize.d.out \ tst.clearstddev.d \ tst.clearstddev.d.out \ tst.count.d \ tst.count.d.out \ tst.count2.d \ tst.count2.d.out \ tst.count3.d \ tst.denormalize.d \ tst.denormalize.d.out \ tst.denormalizeonly.d \ tst.denormalizeonly.d.out \ tst.fmtnormalize.d \ tst.fmtnormalize.d.out \ tst.forms.d \ tst.forms.d.out \ tst.goodkey.d \ tst.keysort.d \ tst.keysort.d.out \ tst.lquantize.d \ tst.lquantize.d.out \ tst.lquantnormal.d \ tst.lquantnormal.d.out \ tst.lquantrange.d \ tst.lquantrange.d.out \ tst.lquantround.d \ tst.lquantround.d.out \ tst.lquantzero.d \ tst.lquantzero.d.out \ tst.max.d \ tst.max.d.out \ tst.max_neg.d \ tst.max_neg.d.out \ tst.min.d \ tst.min.d.out \ tst.min_neg.d \ tst.min_neg.d.out \ tst.multiaggs1.d \ tst.multiaggs2.d \ tst.multiaggs2.d.out \ tst.multiaggs3.d \ tst.multiaggs3.d.out \ tst.multinormalize.d \ tst.multinormalize.d.out \ tst.neglquant.d \ tst.neglquant.d.out \ tst.negorder.d \ tst.negorder.d.out \ tst.negquant.d \ tst.negquant.d.out \ tst.negtrunc.d \ tst.negtrunc.d.out \ tst.negtruncquant.d \ tst.negtruncquant.d.out \ tst.normalize.d \ tst.normalize.d.out \ tst.order.d \ tst.order.d.out \ tst.quantize.d \ tst.quantize.d.out \ tst.quantmany.d \ tst.quantmany.d.out \ tst.quantround.d \ tst.quantround.d.out \ tst.quantzero.d \ tst.quantzero.d.out \ tst.signature.d \ tst.signedkeys.d \ tst.signedkeys.d.out \ tst.signedkeyspos.d \ tst.signedkeyspos.d.out \ tst.sizedkeys.d \ tst.sizedkeys.d.out \ tst.stddev.d \ tst.stddev.d.out \ tst.subr.d \ tst.sum.d \ tst.sum.d.out \ tst.trunc.d \ tst.trunc.d.out \ tst.trunc0.d \ tst.trunc0.d.out \ tst.truncquant.d \ tst.truncquant.d.out \ tst.valsortkeypos.d \ tst.valsortkeypos.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile (revision 291332) @@ -1,32 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DIV_ZERO.divby0.d \ err.D_DIV_ZERO.divby0_1.d \ err.D_DIV_ZERO.divby0_2.d \ err.D_DIV_ZERO.modby0.d \ err.D_SYNTAX.addmin.d \ err.D_SYNTAX.divmin.d \ err.D_SYNTAX.muladd.d \ err.D_SYNTAX.muldiv.d \ tst.basics.d \ tst.basics.d.out \ tst.compcast.d \ tst.compcast.d.out \ tst.compnarrowassign.d \ tst.compnarrowassign.d.out \ tst.execcast.d \ tst.execcast.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile (revision 291332) @@ -1,29 +1,29 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ARR_BADREF.bad.d \ err.D_DECL_ARRBIG.toobig.d \ err.D_DECL_ARRNULL.bad.d \ err.D_DECL_ARRSUB.bad.d \ err.D_DECL_PROTO_TYPE.badtuple.d \ err.D_IDENT_UNDEF.badureg.d \ tst.basic1.d \ tst.basic2.d \ tst.basic3.d \ tst.basic4.d \ tst.basic5.d \ tst.basic6.d \ tst.uregsarray.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile (revision 291332) @@ -1,32 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_OP_INCOMPAT.dupgtype.d \ err.D_OP_INCOMPAT.dupttype.d \ err.D_OP_INCOMPAT.this.d \ err.D_PROTO_ARG.badsig.d \ err.D_PROTO_LEN.toofew.d \ err.D_PROTO_LEN.toomany.d \ err.D_SYNTAX.errassign.d \ err.tupoflow.d \ tst.cpyarray.d \ tst.diffprofile.d \ tst.initialize.d \ tst.invalidref.d \ tst.misc.d \ tst.orthogonality.d \ tst.this.d \ tst.valassign.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/begin/Makefile (revision 291332) @@ -1,22 +1,22 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.begin.d \ err.D_PDESC_ZERO.tick.d \ tst.begin.d \ tst.begin.d.out \ tst.multibegin.d \ tst.multibegin.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile (revision 291332) @@ -1,26 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ADDROF_BITFIELD.BitfieldAddress.d \ err.D_DECL_BFCONST.NegBitField.d \ err.D_DECL_BFCONST.ZeroBitField.d \ err.D_DECL_BFSIZE.ExceedBaseType.d \ err.D_DECL_BFSIZE.GreaterThan64.d \ err.D_DECL_BFTYPE.badtype.d \ err.D_OFFSETOF_BITFIELD.d \ err.D_SIZEOF_BITFIELD.SizeofBitfield.d \ tst.BitFieldPromotion.d \ tst.SizeofBitField.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile (revision 291332) @@ -1,37 +1,37 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.end.d \ err.resize1.d \ err.resize2.d \ err.resize3.d \ err.zerobuf.d \ tst.alignring.d \ tst.cputime.ksh \ tst.dynvarsize.d \ tst.fill1.d \ tst.fill1.d.out \ tst.resize1.d \ tst.resize2.d \ tst.resize3.d \ tst.ring1.d \ tst.ring2.d \ tst.ring2.d.out \ tst.ring3.d \ tst.ring3.d.out \ tst.smallring.d \ tst.switch1.d \ tst.switch1.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile (revision 291332) @@ -1,48 +1,48 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_XLATE_NOCONV.cpuusage.d \ err.D_XLATE_NOCONV.nice.d \ err.D_XLATE_NOCONV.priority.d \ err.D_XLATE_NOCONV.prsize.d \ err.D_XLATE_NOCONV.rssize.d \ tst.arg0.d \ tst.arg0clause.d \ tst.arg1.d \ tst.arg1to8.d \ tst.arg1to8clause.d \ tst.caller.d \ tst.caller1.d \ tst.epid.d \ tst.epid1.d \ tst.errno.d \ tst.errno1.d \ tst.execname.d \ tst.hpriority.d \ tst.id.d \ tst.id1.d \ tst.ipl.d \ tst.ipl1.d \ tst.lwpsinfo.d \ tst.lwpsinfo1.d \ tst.pid.d \ tst.pid1.d \ tst.psinfo.d \ tst.psinfo1.d \ tst.tid.d \ tst.tid1.d \ tst.timestamp.d \ tst.vtimestamp.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/cg/Makefile (revision 291332) @@ -1,18 +1,18 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_NOREG.noreg.d \ err.baddif.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile (revision 291332) @@ -1,26 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_IDENT_UNDEF.aggfun.d \ err.D_IDENT_UNDEF.aggtup.d \ err.D_IDENT_UNDEF.arrtup.d \ err.D_IDENT_UNDEF.body.d \ err.D_IDENT_UNDEF.both.d \ err.D_IDENT_UNDEF.pred.d \ tst.nopred.d \ tst.pred.d \ tst.predfirst.d \ tst.predlast.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile (revision 291332) @@ -1,27 +1,27 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.lowfrequency.d \ err.D_PDESC_ZERO.malformedoverflow.d \ err.D_PDESC_ZERO.nonexistentevent.d \ err.cpcvscpustatpart1.ksh \ err.cpcvscpustatpart2.ksh \ err.cputrackfailtostart.ksh \ err.cputrackterminates.ksh \ err.toomanyenablings.d \ tst.allcpus.ksh \ tst.genericevent.d \ tst.platformevent.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/decls/Makefile (revision 291332) @@ -1,30 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DECL_LOCASSC.NonLocalAssoc.d \ err.D_DECL_LONGINT.LongStruct.d \ err.D_DECL_PARMCLASS.BadStorageClass.d \ err.D_DECL_PROTO_NAME.VoidName.d \ err.D_DECL_PROTO_TYPE.Dyn.d \ err.D_DECL_PROTO_VARARGS.VarLenArgs.d \ err.D_DECL_PROTO_VOID.NonSoleVoid.d \ err.D_DECL_SIGNINT.UnsignedStruct.d \ err.D_DECL_VOIDATTR.ShortVoidDecl.d \ tst.arrays.d \ tst.basics.d \ tst.funcs.d \ tst.pointers.d \ tst.varargsfuncs.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile (revision 291332) @@ -1,32 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ badptr.d \ countdown.d \ counter.d \ errorpath.d \ hello.d \ kstat.d \ ksyms.d \ renormalize.d \ rtime.d \ rw.d \ rwinfo.d \ rwtime.d \ specopen.d \ truss.d \ trussrw.d \ userfunc.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/drops/Makefile (revision 291332) @@ -1,24 +1,24 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ drp.DTRACEDROP_AGGREGATION.d \ drp.DTRACEDROP_DBLERROR.d \ drp.DTRACEDROP_DYNAMIC.d \ drp.DTRACEDROP_PRINCIPAL.d \ drp.DTRACEDROP_PRINCIPAL.end.d \ drp.DTRACEDROP_SPEC.d \ drp.DTRACEDROP_SPECUNAVAIL.d \ drp.DTRACEDROP_STKSTROVERFLOW.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile (revision 291332) @@ -1,118 +1,118 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.InvalidDescription1.d \ man.APIVersion.d \ man.AddSearchPath.d \ man.CoalesceTrace.d \ man.ELFGeneration.d \ man.IncludedFilePath.d \ man.ShowCompilerCode.d \ man.VerboseStabilityReport.d \ tst.AddSearchPath.d.ksh \ tst.BufsizeGiga.d.ksh \ tst.BufsizeKilo.d.ksh \ tst.BufsizeMega.d.ksh \ tst.BufsizeTera.d.ksh \ tst.DataModel32.d.ksh \ tst.DataModel64.d.ksh \ tst.DefineNameWithCPP.d.ksh \ tst.DefineNameWithCPP.d.ksh.out \ tst.DestructWithFunction.d.ksh \ tst.DestructWithFunction.d.ksh.out \ tst.DestructWithID.d.ksh \ tst.DestructWithID.d.ksh.out \ tst.DestructWithModule.d.ksh \ tst.DestructWithModule.d.ksh.out \ tst.DestructWithName.d.ksh \ tst.DestructWithName.d.ksh.out \ tst.DestructWithProvider.d.ksh \ tst.DestructWithProvider.d.ksh.out \ tst.DestructWithoutW.d.ksh \ tst.ELFGenerationOut.d.ksh \ tst.ELFGenerationWithO.d.ksh \ tst.ExitStatus1.d.ksh \ tst.ExitStatus2.d.ksh \ tst.ExtraneousProbeIds.d.ksh \ tst.InvalidFuncName1.d.ksh \ tst.InvalidFuncName2.d.ksh \ tst.InvalidId1.d.ksh \ tst.InvalidId2.d.ksh \ tst.InvalidId3.d.ksh \ tst.InvalidModule1.d.ksh \ tst.InvalidModule2.d.ksh \ tst.InvalidModule3.d.ksh \ tst.InvalidModule4.d.ksh \ tst.InvalidProbeIdentifier.d.ksh \ tst.InvalidProvider1.d.ksh \ tst.InvalidProvider2.d.ksh \ tst.InvalidProvider3.d.ksh \ tst.InvalidProvider4.d.ksh \ tst.InvalidTraceFunc1.d.ksh \ tst.InvalidTraceFunc2.d.ksh \ tst.InvalidTraceFunc3.d.ksh \ tst.InvalidTraceFunc4.d.ksh \ tst.InvalidTraceFunc5.d.ksh \ tst.InvalidTraceFunc6.d.ksh \ tst.InvalidTraceFunc7.d.ksh \ tst.InvalidTraceFunc8.d.ksh \ tst.InvalidTraceFunc9.d.ksh \ tst.InvalidTraceID1.d.ksh \ tst.InvalidTraceID2.d.ksh \ tst.InvalidTraceID3.d.ksh \ tst.InvalidTraceID4.d.ksh \ tst.InvalidTraceID5.d.ksh \ tst.InvalidTraceID6.d.ksh \ tst.InvalidTraceID7.d.ksh \ tst.InvalidTraceModule1.d.ksh \ tst.InvalidTraceModule2.d.ksh \ tst.InvalidTraceModule3.d.ksh \ tst.InvalidTraceModule4.d.ksh \ tst.InvalidTraceModule5.d.ksh \ tst.InvalidTraceModule6.d.ksh \ tst.InvalidTraceModule7.d.ksh \ tst.InvalidTraceModule8.d.ksh \ tst.InvalidTraceName1.d.ksh \ tst.InvalidTraceName2.d.ksh \ tst.InvalidTraceName3.d.ksh \ tst.InvalidTraceName4.d.ksh \ tst.InvalidTraceName5.d.ksh \ tst.InvalidTraceName6.d.ksh \ tst.InvalidTraceName7.d.ksh \ tst.InvalidTraceName8.d.ksh \ tst.InvalidTraceName9.d.ksh \ tst.InvalidTraceProvider1.d.ksh \ tst.InvalidTraceProvider2.d.ksh \ tst.InvalidTraceProvider3.d.ksh \ tst.InvalidTraceProvider4.d.ksh \ tst.InvalidTraceProvider5.d.ksh \ tst.MultipleInvalidProbeId.d.ksh \ tst.PreprocessorStatement.d.ksh \ tst.QuietMode.d.ksh \ tst.QuietMode.d.ksh.out \ tst.TestCompile.d.ksh \ tst.TestCompile.d.ksh.out \ tst.UnDefineNameWithCPP.d.ksh \ tst.ZeroFunctionProbes.d.ksh \ tst.ZeroFunctionProbes.d.ksh.out \ tst.ZeroModuleProbes.d.ksh \ tst.ZeroModuleProbes.d.ksh.out \ tst.ZeroNameProbes.d.ksh \ tst.ZeroNameProbes.d.ksh.out \ tst.ZeroProbeIdentfier.d.ksh \ tst.ZeroProbesWithoutZ.d.ksh \ tst.ZeroProviderProbes.d.ksh \ tst.ZeroProviderProbes.d.ksh.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/end/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/end/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/end/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_IDENT_UNDEF.timespent.d \ tst.end.d \ tst.endwithoutbegin.d \ tst.multibeginend.d \ tst.multiend.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/enum/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DECL_IDRED.EnumSameName.d \ err.D_UNKNOWN.RepeatIdentifiers.d \ tst.EnumEquality.d \ tst.EnumSameValue.d \ tst.EnumValAssign.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/error/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/error/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/error/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.DTRACEFLT_BADADDR.d \ tst.DTRACEFLT_DIVZERO.d \ tst.DTRACEFLT_UNKNOWN.d \ tst.error.d \ tst.errorend.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/exit/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PROTO_LEN.noarg.d \ err.exitarg1.d \ tst.basic1.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile (revision 291332) @@ -1,26 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.notreturn.d \ tst.basic.d \ tst.functionentry.d \ tst.functionreturnvalue.d \ tst.ioctlargs.d \ tst.offset.d \ tst.offsetzero.d \ tst.return.d \ tst.return0.d \ tst.tailcall.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile (revision 291332) @@ -1,113 +1,113 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_FUNC_UNDEF.progenyofbad1.d \ err.D_OP_VFPTR.badop.d \ err.D_PROTO_ARG.chillbadarg.d \ err.D_PROTO_ARG.copyoutbadarg.d \ err.D_PROTO_ARG.mobadarg.d \ err.D_PROTO_ARG.raisebadarg.d \ err.D_PROTO_ARG.tolower.d \ err.D_PROTO_ARG.toupper.d \ err.D_PROTO_LEN.allocanoarg.d \ err.D_PROTO_LEN.badbreakpoint.d \ err.D_PROTO_LEN.chilltoofew.d \ err.D_PROTO_LEN.chilltoomany.d \ err.D_PROTO_LEN.copyoutstrbadarg.d \ err.D_PROTO_LEN.copyoutstrtoofew.d \ err.D_PROTO_LEN.copyouttoofew.d \ err.D_PROTO_LEN.copyouttoomany.d \ err.D_PROTO_LEN.motoofew.d \ err.D_PROTO_LEN.motoomany.d \ err.D_PROTO_LEN.mtabadarg.d \ err.D_PROTO_LEN.mtatoofew.d \ err.D_PROTO_LEN.mtatoomany.d \ err.D_PROTO_LEN.panicbadarg.d \ err.D_PROTO_LEN.progenyofbad2.d \ err.D_PROTO_LEN.stopbadarg.d \ err.D_PROTO_LEN.tolower.d \ err.D_PROTO_LEN.tolowertoomany.d \ err.D_PROTO_LEN.toupper.d \ err.D_PROTO_LEN.touppertoomany.d \ err.D_STRINGOF_TYPE.badstringof.d \ err.D_VAR_UNDEF.badvar.d \ err.badalloca.d \ err.badalloca2.d \ err.badbcopy.d \ err.badbcopy1.d \ err.badbcopy2.d \ err.badbcopy3.d \ err.badbcopy4.d \ err.badbcopy5.d \ err.badbcopy6.d \ err.badchill.d \ err.chillbadarg.ksh \ err.copyout.d \ err.copyoutbadaddr.ksh \ err.copyoutstrbadaddr.ksh \ err.inet_ntoa6badaddr.d \ err.inet_ntoabadaddr.d \ err.inet_ntopbadaddr.d \ err.inet_ntopbadarg.d \ tst.badfreopen.ksh \ tst.basename.d \ tst.basename.d.out \ tst.bcopy.d \ tst.chill.ksh \ tst.cleanpath.d \ tst.cleanpath.d.out \ tst.copyin.d \ tst.copyinto.d \ tst.ddi_pathname.d \ tst.default.d \ tst.freopen.ksh \ tst.ftruncate.ksh \ tst.ftruncate.ksh.out \ tst.hton.d \ tst.index.d \ tst.index.d.out \ tst.inet_ntoa.d \ tst.inet_ntoa.d.out \ tst.inet_ntoa6.d \ tst.inet_ntoa6.d.out \ tst.inet_ntop.d \ tst.inet_ntop.d.out \ tst.lltostr.d \ tst.lltostr.d.out \ tst.lltostrbase.d \ tst.lltostrbase.d.out \ tst.mutex_owned.d \ tst.mutex_owner.d \ tst.mutex_type_adaptive.d \ tst.progenyof.d \ tst.rand.d \ tst.strchr.d \ tst.strchr.d.out \ tst.strjoin.d \ tst.strjoin.d.out \ tst.strstr.d \ tst.strstr.d.out \ tst.strtok.d \ tst.strtok.d.out \ tst.strtok_null.d \ tst.substr.d \ tst.substr.d.out \ tst.substrminate.d \ tst.substrminate.d.out \ tst.system.d \ tst.system.d.out \ tst.tolower.d \ tst.toupper.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile (revision 291332) @@ -1,20 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ADDROF_LVAL.d \ err.D_EMPTY.empty.d \ tst.clauses.d \ tst.stmts.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/include/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/include/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/include/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.includefirst.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/inline/Makefile (revision 291332) @@ -1,28 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DECL_IDRED.redef1.d \ err.D_DECL_IDRED.redef2.d \ err.D_IDENT_UNDEF.recur.d \ err.D_OP_INCOMPAT.baddef1.d \ err.D_OP_INCOMPAT.baddef2.d \ err.D_OP_INCOMPAT.badxlate.d \ tst.InlineDataAssign.d \ tst.InlineExpression.d \ tst.InlineKinds.d \ tst.InlineKinds.d.out \ tst.InlineTypedef.d \ tst.InlineWritableAssign.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/io/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/io/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/io/Makefile (revision 291332) @@ -1,18 +1,18 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.fds.d \ tst.fds.d.out \ TESTEXES= \ CFILES= \ tst.fds.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/ip/Makefile (revision 291332) @@ -1,36 +1,36 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.ipv4localicmp.ksh \ tst.ipv4localicmp.ksh.out \ tst.ipv4localtcp.ksh \ tst.ipv4localtcp.ksh.out \ tst.ipv4localudp.ksh \ tst.ipv4localudp.ksh.out \ tst.ipv4remoteicmp.ksh \ tst.ipv4remoteicmp.ksh.out \ tst.ipv4remotetcp.ksh \ tst.ipv4remotetcp.ksh.out \ tst.ipv4remoteudp.ksh \ tst.ipv4remoteudp.ksh.out \ tst.ipv6localicmp.ksh \ tst.ipv6localicmp.ksh.out \ tst.ipv6remoteicmp.ksh \ tst.ipv6remoteicmp.ksh.out \ tst.localtcpstate.ksh \ tst.localtcpstate.ksh.out \ tst.remotetcpstate.ksh \ tst.remotetcpstate.ksh.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile (revision 291332) @@ -1,44 +1,44 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.Abort.ksh \ tst.Abort.ksh.out \ tst.Bean.ksh \ tst.Bean.ksh.out \ tst.Close.ksh \ tst.Close.ksh.out \ tst.Drop.ksh \ tst.Drop.ksh.out \ tst.Enable.ksh \ tst.Enable.ksh.out \ tst.FunctionLookup.ksh \ tst.FunctionLookup.ksh.out \ tst.GetAggregate.ksh \ tst.MaxConsumers.ksh \ tst.MaxConsumers.ksh.out \ tst.MultiAggPrinta.ksh \ tst.MultiAggPrinta.ksh.out \ tst.ProbeData.ksh \ tst.ProbeData.ksh.out \ tst.ProbeDescription.ksh \ tst.ProbeDescription.ksh.out \ tst.StateMachine.ksh \ tst.StateMachine.ksh.out \ tst.StopLock.ksh \ tst.StopLock.ksh.out \ tst.printa.d \ tst.printa.d.out \ TESTEXES= \ CFILES= \ tst.FunctionLookup.c \ tst.ProbeData.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/json/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/json/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/json/Makefile (revision 291332) @@ -1,23 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.general.d \ tst.general.d.out \ tst.strsize.d \ tst.strsize.d.out \ tst.usdt.d \ tst.usdt.d.out \ usdt.d \ TESTEXES= \ CFILES= \ tst.usdt.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile (revision 291332) @@ -1,30 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_CHR_NL.char.d \ err.D_CHR_NULL.char.d \ err.D_INT_DIGIT.InvalidDigit.d \ err.D_INT_OFLOW.BigInt.d \ err.D_STR_NL.string.d \ err.D_SYNTAX.brace1.d \ err.D_SYNTAX.brace2.d \ err.D_SYNTAX.brack1.d \ err.D_SYNTAX.brack2.d \ err.D_SYNTAX.brack3.d \ err.D_SYNTAX.paren1.d \ err.D_SYNTAX.paren2.d \ err.D_SYNTAX.paren3.d \ tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile (revision 291332) @@ -1,50 +1,50 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_LLQUANT_FACTOREVEN.nodivide.d \ err.D_LLQUANT_FACTOREVEN.notfactor.d \ err.D_LLQUANT_FACTORMATCH.d \ err.D_LLQUANT_FACTORNSTEPS.d \ err.D_LLQUANT_FACTORSMALL.d \ err.D_LLQUANT_FACTORTYPE.d \ err.D_LLQUANT_FACTORVAL.d \ err.D_LLQUANT_HIGHMATCH.d \ err.D_LLQUANT_HIGHTYPE.d \ err.D_LLQUANT_HIGHVAL.d \ err.D_LLQUANT_LOWMATCH.d \ err.D_LLQUANT_LOWTYPE.d \ err.D_LLQUANT_LOWVAL.d \ err.D_LLQUANT_MAGRANGE.d \ err.D_LLQUANT_MAGTOOBIG.d \ err.D_LLQUANT_NSTEPMATCH.d \ err.D_LLQUANT_NSTEPTYPE.d \ err.D_LLQUANT_NSTEPVAL.d \ tst.bases.d \ tst.bases.d.out \ tst.basic.d \ tst.basic.d.out \ tst.negorder.d \ tst.negorder.d.out \ tst.negvalue.d \ tst.negvalue.d.out \ tst.normal.d \ tst.normal.d.out \ tst.range.d \ tst.range.d.out \ tst.steps.d \ tst.steps.d.out \ tst.trunc.d \ tst.trunc.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.dtracedcmd.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/mib/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.icmp.ksh \ tst.tcp.ksh \ tst.udp.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/misc/Makefile (revision 291332) @@ -1,30 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRAGMA_OPTSET.d \ tst.badopt.d \ tst.boolopt.d \ tst.boolopt.d.out \ tst.dofmax.ksh \ tst.dynopt.d \ tst.dynopt.d.out \ tst.enablerace.ksh \ tst.haslam.d \ tst.include.ksh \ tst.macroglob.ksh \ tst.macroglob.ksh.out \ tst.roch.d \ tst.schrock.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile (revision 291332) @@ -1,34 +1,34 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRINTA_AGGKEY.d \ err.D_PRINTA_AGGPROTO.d \ tst.many.d \ tst.many.d.out \ tst.same.d \ tst.same.d.out \ tst.sort.d \ tst.sort.d.out \ tst.sortpos.d \ tst.sortpos.d.out \ tst.tuplecompat.d \ tst.tuplecompat.d.out \ tst.zero.d \ tst.zero.d.out \ tst.zero2.d \ tst.zero2.d.out \ tst.zero3.d \ tst.zero3.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.call.d \ tst.call3.d \ TESTEXES= \ CFILES= \ tst.call.c \ tst.call3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile (revision 291332) @@ -1,28 +1,28 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_OFFSETOF_BITFIELD.bitfield.d \ err.D_OFFSETOF_TYPE.badtype.d \ err.D_OFFSETOF_TYPE.notsou.d \ err.D_UNKNOWN.OffsetofNULL.d \ err.D_UNKNOWN.badmemb.d \ tst.OffsetofAlias.d \ tst.OffsetofArith.d \ tst.OffsetofUnion.d \ tst.struct.d \ tst.struct.d.out \ tst.union.d \ tst.union.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/operators/Makefile (revision 291332) @@ -1,18 +1,18 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.ternary.d \ tst.ternary.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/pid/Makefile (revision 291332) @@ -1,69 +1,69 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.badlib.d \ err.D_PDESC_ZERO.badproc1.d \ err.D_PROC_BADPID.badproc2.d \ err.D_PROC_CREATEFAIL.many.d \ err.D_PROC_FUNC.badfunc.d \ err.D_PROC_LIB.libdash.d \ err.D_PROC_NAME.alldash.d \ err.D_PROC_NAME.badname.d \ err.D_PROC_NAME.globdash.d \ err.D_PROC_OFF.toobig.d \ tst.addprobes.ksh \ tst.args1.d \ tst.coverage.d \ tst.emptystack.d \ tst.emptystack.d.out \ tst.float.d \ tst.fork.d \ tst.gcc.d \ tst.killonerror.ksh \ tst.main.ksh \ tst.manypids.ksh \ tst.newprobes.ksh \ tst.newprobes.ksh.out \ tst.probemod.ksh \ tst.provregex1.ksh \ tst.provregex2.ksh \ tst.provregex2.ksh.out \ tst.provregex3.ksh \ tst.provregex3.ksh.out \ tst.provregex4.ksh \ tst.provregex4.ksh.out \ tst.ret1.d \ tst.ret2.d \ tst.vfork.d \ tst.weak1.d \ tst.weak2.d \ TESTEXES= \ err.D_PDESC_ZERO.badlib.exe \ err.D_PROC_CREATEFAIL.many.exe \ err.D_PROC_FUNC.badfunc.exe \ err.D_PROC_LIB.libdash.exe \ err.D_PROC_NAME.alldash.exe \ err.D_PROC_NAME.badname.exe \ err.D_PROC_NAME.globdash.exe \ err.D_PROC_OFF.toobig.exe \ tst.coverage.exe \ tst.emptystack.exe \ CFILES= \ tst.args1.c \ tst.float.c \ tst.fork.c \ tst.gcc.c \ tst.ret1.c \ tst.ret2.c \ tst.vfork.c \ tst.weak1.c \ tst.weak2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.available.d \ tst.libmap.d \ TESTEXES= \ tst.available.exe \ tst.libmap.exe \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile (revision 291332) @@ -1,48 +1,48 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.BadAlign.d \ err.D_ADDROF_VAR.ArrayVar.d \ err.D_ADDROF_VAR.DynamicVar.d \ err.D_ADDROF_VAR.agg.d \ err.D_DEREF_NONPTR.noptr.d \ err.D_DEREF_VOID.VoidPointerDeref.d \ err.D_OP_ARRFUN.ArrayAssignment.d \ err.D_OP_INCOMPAT.VoidPointerArith.d \ err.D_OP_LVAL.AddressChange.d \ err.D_OP_PTR.NonPointerAccess.d \ err.D_OP_PTR.badpointer.d \ err.D_OP_SOU.BadPointerAccess.d \ err.D_OP_SOU.badpointer.d \ err.InvalidAddress1.d \ err.InvalidAddress2.d \ err.InvalidAddress3.d \ err.InvalidAddress4.d \ err.InvalidAddress5.d \ tst.ArrayPointer1.d \ tst.ArrayPointer2.d \ tst.ArrayPointer3.d \ tst.GlobalVar.d \ tst.IntegerArithmetic1.d \ tst.PointerArithmetic1.d \ tst.PointerArithmetic2.d \ tst.PointerArithmetic3.d \ tst.PointerAssignment.d \ tst.ValidPointer1.d \ tst.ValidPointer2.d \ tst.VoidCast.d \ tst.basic1.d \ tst.basic2.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile (revision 291332) @@ -1,30 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRAGERR.d \ err.D_PRAGMA_DEPEND.main.d \ err.D_PRAGMA_INVAL.d \ err.D_PRAGMA_MALFORM.d \ err.D_PRAGMA_UNUSED.UnusedPragma.d \ err.circlibdep.ksh \ err.invalidlibdep.ksh \ tst.libchain.ksh \ tst.libdep.ksh \ tst.libdepfullyconnected.ksh \ tst.libdepsepdir.ksh \ tst.temporal.ksh \ tst.temporal2.ksh \ tst.temporal3.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile (revision 291332) @@ -1,25 +1,25 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRED_SCALAR.NonScalarPred.d \ err.D_SYNTAX.invalid.d \ err.D_SYNTAX.operr.d \ tst.argsnotcached.d \ tst.basics.d \ tst.basics.d.out \ tst.complex.d \ tst.complex.d.out \ tst.predcache.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile (revision 291332) @@ -1,53 +1,53 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_IDENT_UNDEF.afterprobe.d \ err.D_PRAGCTL_INVAL.tabdefine.d \ err.D_SYNTAX.withoutpound.d \ err.defincomp.d \ err.ifdefelsenotendif.d \ err.ifdefincomp.d \ err.ifdefnotendif.d \ err.incompelse.d \ err.mulelse.d \ tst.ifdef.d \ tst.ifdef.d.out \ tst.ifndef.d \ tst.ifndef.d.out \ tst.ifnotdef.d \ tst.ifnotdef.d.out \ tst.logicaland.d \ tst.logicaland.d.out \ tst.logicalandor.d \ tst.logicalandor.d.out \ tst.logicalor.d \ tst.logicalor.d.out \ tst.muland.d \ tst.muland.d.out \ tst.mulor.d \ tst.mulor.d.out \ tst.precondi.d \ tst.precondi.d.out \ tst.predicatedeclare.d \ tst.preexp.d \ tst.preexp.d.out \ tst.preexpelse.d \ tst.preexpelse.d.out \ tst.preexpif.d \ tst.preexpif.d.out \ tst.preexpifelse.d \ tst.preexpifelse.d.out \ tst.withinprobe.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/print/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/print/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/print/Makefile (revision 291332) @@ -1,32 +1,32 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRINT_AGG.bad.d \ err.D_PRINT_VOID.bad.d \ err.D_PROTO_LEN.bad.d \ tst.array.d \ tst.array.d.out \ tst.bitfield.d \ tst.bitfield.d.out \ tst.dyn.d \ tst.enum.d \ tst.enum.d.out \ tst.primitive.d \ tst.primitive.d.out \ tst.struct.d \ tst.struct.d.out \ tst.xlate.d \ tst.xlate.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/printa/Makefile (revision 291332) @@ -1,40 +1,40 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRINTA_AGGARG.badagg.d \ err.D_PRINTA_AGGARG.badfmt.d \ err.D_PRINTA_AGGARG.badval.d \ err.D_PRINTA_PROTO.bad.d \ err.D_PRINTF_ARG_TYPE.jstack.d \ err.D_PRINTF_ARG_TYPE.stack.d \ err.D_PRINTF_ARG_TYPE.ustack.d \ tst.basics.d \ tst.basics.d.out \ tst.def.d \ tst.def.d.out \ tst.dynwidth.d \ tst.dynwidth.d.out \ tst.fmt.d \ tst.fmt.d.out \ tst.largeusersym.ksh \ tst.many.d \ tst.manyval.d \ tst.manyval.d.out \ tst.stack.d \ tst.tuple.d \ tst.tuple.d.out \ tst.walltimestamp.ksh \ tst.walltimestamp.ksh.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/printf/Makefile (revision 291332) @@ -1,68 +1,68 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PRINTF_AGG_CONV.aggfmt.d \ err.D_PRINTF_ARG_EXTRA.toomany.d \ err.D_PRINTF_ARG_EXTRA.widths.d \ err.D_PRINTF_ARG_FMT.badfmt.d \ err.D_PRINTF_ARG_PROTO.novalue.d \ err.D_PRINTF_ARG_TYPE.aggarg.d \ err.D_PRINTF_ARG_TYPE.recursive.d \ err.D_PRINTF_DYN_PROTO.noprec.d \ err.D_PRINTF_DYN_PROTO.nowidth.d \ err.D_PRINTF_DYN_TYPE.badprec.d \ err.D_PRINTF_DYN_TYPE.badwidth.d \ err.D_PROTO_LEN.toofew.d \ err.D_SYNTAX.badconv1.d \ err.D_SYNTAX.badconv2.d \ err.D_SYNTAX.badconv3.d \ tst.basics.d \ tst.basics.d.out \ tst.flags.d \ tst.flags.d.out \ tst.hello.d \ tst.hello.d.out \ tst.ints.d \ tst.ints.d.out \ tst.precs.d \ tst.precs.d.out \ tst.print-f.d \ tst.print-f.d.out \ tst.printT.ksh \ tst.printT.ksh.out \ tst.printY.ksh \ tst.printY.ksh.out \ tst.printcont.d \ tst.printcont.d.out \ tst.printeE.d \ tst.printeE.d.out \ tst.printgG.d \ tst.printgG.d.out \ tst.rawfmt.d \ tst.rawfmt.d.out \ tst.signs.d \ tst.signs.d.out \ tst.str.d \ tst.str.d.out \ tst.sym.d \ tst.sym.d.out \ tst.uints.d \ tst.uints.d.out \ tst.widths.d \ tst.widths.d.out \ tst.widths1.d \ tst.wp.d \ tst.wp.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/privs/Makefile (revision 291332) @@ -1,24 +1,24 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.fds.ksh \ tst.func_access.ksh \ tst.getf.ksh \ tst.kpriv.ksh \ tst.op_access.ksh \ tst.procpriv.ksh \ tst.providers.ksh \ tst.unpriv_funcs.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile (revision 291332) @@ -1,36 +1,36 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.probeqtn.d \ err.D_PDESC_ZERO.probestar.d \ err.D_PDESC_ZERO.tickstar.d \ err.D_SYNTAX.assign.d \ err.D_SYNTAX.declare.d \ err.D_SYNTAX.declarein.d \ err.D_SYNTAX.lbraces.d \ err.D_SYNTAX.probespec.d \ err.D_SYNTAX.rbraces.d \ err.D_SYNTAX.recdec.d \ tst.basic1.d \ tst.check.d \ tst.declare.d \ tst.declareafter.d \ tst.emptyprobe.d \ tst.pragma.d \ tst.pragmaaftertab.d \ tst.pragmainside.d \ tst.pragmaoutside.d \ tst.probestar.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 291332) @@ -1,30 +1,30 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.create.ksh \ tst.discard.ksh \ tst.exec.ksh \ tst.execfail.ENOENT.ksh \ tst.execfail.ksh \ tst.exitcore.ksh \ tst.exitexit.ksh \ tst.exitkilled.ksh \ tst.signal.ksh \ tst.sigwait.d \ tst.startexit.ksh \ TESTEXES= \ CFILES= \ tst.sigwait.c \ LDADD.tst.sigwait.exe+= -lrt DPADD.tst.sigwait.exe+= ${LIBRT} -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile (revision 291332) @@ -1,53 +1,53 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.profile.d \ err.D_PDESC_ZEROonens.d \ err.D_PDESC_ZEROonensec.d \ err.D_PDESC_ZEROoneus.d \ err.D_PDESC_ZEROoneusec.d \ tst.argtest.d \ tst.argtest.d.out \ tst.basic.d \ tst.basic.d.out \ tst.func.ksh \ tst.mod.ksh \ tst.profilehz.d \ tst.profilehz.d.out \ tst.profilems.d \ tst.profilems.d.out \ tst.profilemsec.d \ tst.profilemsec.d.out \ tst.profilenhz.d \ tst.profilenhz.d.out \ tst.profilens.d \ tst.profilens.d.out \ tst.profilensec.d \ tst.profilensec.d.out \ tst.profiles.d \ tst.profiles.d.out \ tst.profilesec.d \ tst.profilesec.d.out \ tst.profileus.d \ tst.profileus.d.out \ tst.profileusec.d \ tst.profileusec.d.out \ tst.sym.ksh \ tst.ufunc.ksh \ tst.ufuncsort.ksh \ tst.ufuncsort.ksh.out \ tst.umod.ksh \ tst.usym.ksh \ TESTEXES= \ CFILES= \ tst.ufuncsort.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/providers/Makefile (revision 291332) @@ -1,44 +1,44 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_INVAL.wrongdec4.d \ err.D_PDESC_ZERO.nonprofile.d \ err.D_PDESC_ZERO.wrongdec1.d \ err.D_PDESC_ZERO.wrongdec2.d \ err.D_PDESC_ZERO.wrongdec3.d \ tst.basics.d \ tst.basics.d.out \ tst.beginexit.d \ tst.beginprof.d \ tst.beginprof.d.out \ tst.probattrs.d \ tst.probattrs.d.out \ tst.probefunc.d \ tst.probefunc.d.out \ tst.probemod.d \ tst.probemod.d.out \ tst.probename.d \ tst.probename.d.out \ tst.probprov.d \ tst.probprov.d.out \ tst.profend.d \ tst.profend.d.out \ tst.profexit.d \ tst.profexit.d.out \ tst.trace.d \ tst.trace.d.out \ tst.twoprof.d \ tst.twoprof.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.raise1.d \ tst.raise2.d \ tst.raise3.d \ TESTEXES= \ CFILES= \ tst.raise1.c \ tst.raise2.c \ tst.raise3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/rates/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.aggrate.d \ tst.aggrate.d.out \ tst.statusrate.d \ tst.switchrate.d \ tst.switchrate.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile (revision 291332) @@ -1,54 +1,54 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.basename.d \ tst.caller.d \ tst.cleanpath.d \ tst.copyin.d \ tst.copyin2.d \ tst.ddi_pathname.d \ tst.dirname.d \ tst.errno.d \ tst.execname.d \ tst.gid.d \ tst.hton.d \ tst.index.d \ tst.msgdsize.d \ tst.msgsize.d \ tst.null.d \ tst.pid.d \ tst.ppid.d \ tst.progenyof.d \ tst.random.d \ tst.rw.d \ tst.shortstr.d \ tst.stack.d \ tst.stackdepth.d \ tst.stddev.d \ tst.strchr.d \ tst.strjoin.d \ tst.strstr.d \ tst.strtok.d \ tst.substr.d \ tst.ucaller.d \ tst.uid.d \ tst.unalign.d \ tst.uregs.d \ tst.ustack.d \ tst.ustackdepth.d \ tst.vahole.d \ tst.violentdeath.ksh \ tst.zonename.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile (revision 291332) @@ -1,37 +1,37 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ARR_LOCAL.thisarray.d \ err.D_DECL_CLASS.selfthis.d \ err.D_DECL_CLASS.thisself.d \ err.D_DECL_IDRED.errval.d \ err.D_OP_INCOMPAT.dec.err.d \ err.D_OP_INCOMPAT.dupgtype.d \ err.D_OP_INCOMPAT.dupltype.d \ err.D_OP_INCOMPAT.dupttype.d \ err.D_SYNTAX.declare.d \ err.bigglobal.d \ err.biglocal.d \ tst.basicvar.d \ tst.basicvar.d.out \ tst.localvar.d \ tst.misc.d \ tst.self.d \ tst.selfarray.d \ tst.selfarray2.d \ tst.selfthis.d \ tst.this.d \ tst.thisself.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/sched/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.enqueue.d \ tst.oncpu.d \ tst.stackdepth.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile (revision 291332) @@ -1,49 +1,49 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_MACRO_UNDEF.invalidargs.d \ err.D_OP_LVAL.rdonly.d \ err.D_OP_WRITE.usepidmacro.d \ err.D_SYNTAX.concat.d \ err.D_SYNTAX.desc.d \ err.D_SYNTAX.inval.d \ err.D_SYNTAX.pid.d \ tst.D_MACRO_UNUSED.overflow.ksh \ tst.arg0.d \ tst.arguments.ksh \ tst.assign.d \ tst.basic.d \ tst.egid.d \ tst.egid.ksh \ tst.euid.d \ tst.euid.ksh \ tst.gid.d \ tst.gid.ksh \ tst.pgid.d \ tst.pid.d \ tst.ppid.d \ tst.ppid.ksh \ tst.projid.d \ tst.projid.ksh \ tst.quite.d \ tst.sid.d \ tst.sid.ksh \ tst.stringmacro.ksh \ tst.taskid.d \ tst.taskid.ksh \ tst.trace.d \ tst.uid.d \ tst.uid.ksh \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.sdtargs.d \ TESTEXES= \ CFILES= \ tst.sdtargs.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile (revision 291332) @@ -1,31 +1,31 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_IDENT_BADREF.SizeofAssoc.d \ err.D_IDENT_UNDEF.UnknownSymbol.d \ err.D_SIZEOF_TYPE.badstruct.d \ err.D_SIZEOF_TYPE.d \ err.D_SYNTAX.SizeofBadType.d \ tst.SizeofArray.d \ tst.SizeofDataTypes.d \ tst.SizeofExpression.d \ tst.SizeofNULL.d \ tst.SizeofStrConst.d \ tst.SizeofStrConst.d.out \ tst.SizeofString1.d \ tst.SizeofString1.d.out \ tst.SizeofString2.d \ tst.SizeofString2.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile (revision 291332) @@ -1,75 +1,75 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ bug.1001148.SpecSizeVariations.d \ err.BufSizeVariations1.d \ err.BufSizeVariations2.d \ err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ err.D_ACT_SPEC.SpeculateWithChill.d \ err.D_ACT_SPEC.SpeculateWithCopyOut.d \ err.D_ACT_SPEC.SpeculateWithCopyOutStr.d \ err.D_ACT_SPEC.SpeculateWithPanic.d \ err.D_ACT_SPEC.SpeculateWithRaise.d \ err.D_ACT_SPEC.SpeculateWithStop.d \ err.D_AGG_COMM.AggAftCommit.d \ err.D_AGG_SPEC.SpeculateWithAvg.d \ err.D_AGG_SPEC.SpeculateWithCount.d \ err.D_AGG_SPEC.SpeculateWithLquant.d \ err.D_AGG_SPEC.SpeculateWithMax.d \ err.D_AGG_SPEC.SpeculateWithMin.d \ err.D_AGG_SPEC.SpeculateWithQuant.d \ err.D_AGG_SPEC.SpeculateWithStddev.d \ err.D_AGG_SPEC.SpeculateWithSum.d \ err.D_COMM_COMM.CommitAftCommit.d \ err.D_COMM_COMM.DisjointCommit.d \ err.D_COMM_DREC.CommitAftDataRec.d \ err.D_DREC_COMM.DataRecAftCommit.d \ err.D_DREC_COMM.ExitAfterCommit.d \ err.D_EXIT_SPEC.ExitAftSpec.d \ err.D_PRAGMA_MALFORM.NspecExpr.d \ err.D_PRAGMA_OPTSET.HugeNspecValue.d \ err.D_PRAGMA_OPTSET.InvalidSpecSize.d \ err.D_PRAGMA_OPTSET.NegSpecSize.d \ err.D_PROTO_LEN.SpecNoId.d \ err.D_SPEC_COMM.SpecAftCommit.d \ err.D_SPEC_DREC.SpecAftDataRec.d \ err.D_SPEC_SPEC.SpecAftSpec.d \ err.NegativeBufSize.d \ err.NegativeNspec.d \ err.NegativeSpecSize.d \ err.SpecSizeVariations1.d \ err.SpecSizeVariations2.d \ tst.CommitAfterDiscard.d \ tst.CommitWithZero.d \ tst.DataRecAftDiscard.d \ tst.DiscardAftCommit.d \ tst.DiscardAftDataRec.d \ tst.DiscardAftDiscard.d \ tst.DiscardWithZero.d \ tst.ExitAftDiscard.d \ tst.NoSpecBuffer.d \ tst.SpecSizeVariations1.d \ tst.SpecSizeVariations2.d \ tst.SpecSizeVariations3.d \ tst.SpeculateWithRandom.d \ tst.SpeculationCommit.d \ tst.SpeculationDiscard.d \ tst.SpeculationID.d \ tst.SpeculationWithZero.d \ tst.TwoSpecBuffers.d \ tst.negcommit.d \ tst.negspec.d \ tst.zerosize.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/stability/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ATTR_MIN.MinAttributes.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/stack/Makefile (revision 291332) @@ -1,22 +1,22 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_STACK_PROTO.bad.d \ err.D_STACK_SIZE.d \ err.D_USTACK_FRAMES.bad.d \ err.D_USTACK_PROTO.bad.d \ err.D_USTACK_STRSIZE.bad.d \ tst.default.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.default.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/stop/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.stop1.d \ tst.stop2.d \ TESTEXES= \ CFILES= \ tst.stop1.c \ tst.stop2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.strlen1.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile (revision 291332) @@ -1,20 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.BaseTooLarge.d \ err.BaseTooSmall.d \ tst.strtoll.d \ tst.strtoll.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/struct/Makefile (revision 291332) @@ -1,31 +1,31 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ADDROF_VAR.StructPointer.d \ err.D_DECL_COMBO.StructWithoutColon.d \ err.D_DECL_COMBO.StructWithoutColon1.d \ err.D_DECL_INCOMPLETE.circular.d \ err.D_DECL_INCOMPLETE.order.d \ err.D_DECL_INCOMPLETE.order2.d \ err.D_DECL_INCOMPLETE.recursive.d \ err.D_DECL_INCOMPLETE.simple.d \ err.D_DECL_VOIDOBJ.baddec.d \ err.D_PROTO_ARG.DupStructAssoc.d \ tst.StructAssoc.d \ tst.StructDataTypes.d \ tst.StructInside.d \ tst.clauselocal.d \ tst.clauselocal.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile (revision 291332) @@ -1,18 +1,18 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.args.d \ tst.openret.ksh \ TESTEXES= \ CFILES= \ tst.args.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile (revision 291332) @@ -1,19 +1,19 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.post.d \ tst.post_chan.d \ TESTEXES= \ CFILES= \ tst.post.c \ tst.post_chan.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile (revision 291332) @@ -1,38 +1,38 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PDESC_ZERO.tick.d \ err.D_PDESC_ZEROonens.d \ err.D_PDESC_ZEROonensec.d \ err.D_PDESC_ZEROoneus.d \ err.D_PDESC_ZEROoneusec.d \ tst.tickarg0.d \ tst.tickms.d \ tst.tickms.d.out \ tst.tickmsec.d \ tst.tickmsec.d.out \ tst.tickns.d \ tst.tickns.d.out \ tst.ticknsec.d \ tst.ticknsec.d.out \ tst.ticks.d \ tst.ticks.d.out \ tst.ticksec.d \ tst.ticksec.d.out \ tst.tickus.d \ tst.tickus.d.out \ tst.tickusec.d \ tst.tickusec.d.out \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/trace/Makefile (revision 291332) @@ -1,24 +1,24 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PROTO_LEN.bad.d \ err.D_TRACE_AGG.bad.d \ err.D_TRACE_VOID.bad.d \ tst.dyn.d \ tst.misc.d \ tst.qstring.d \ tst.qstring.d.out \ tst.string.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile (revision 291332) @@ -1,26 +1,26 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_PROTO_ARG.badsize.d \ err.D_PROTO_LEN.toofew.d \ err.D_TRACEMEM_ADDR.badaddr.d \ err.D_TRACEMEM_ARGS.d \ err.D_TRACEMEM_DYNSIZE.d \ err.D_TRACEMEM_SIZE.negsize.d \ err.D_TRACEMEM_SIZE.zerosize.d \ tst.dynsize.d \ tst.dynsize.d.out \ tst.rootvp.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/translators/Makefile (revision 291332) @@ -1,51 +1,51 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DECL_TYPERED.BadTransDecl.d \ err.D_OP_INCOMPLETE.NonExistentInput1.d \ err.D_SYNTAX.BadTransDecl1.d \ err.D_SYNTAX.BadTransDecl3.d \ err.D_SYNTAX.BadTransDecl4.d \ err.D_TYPE_MEMBER.NonExistentInput2.d \ err.D_XLATE_INCOMPAT.BadInputType1.d \ err.D_XLATE_MEMB.NonExistentOutput2.d \ err.D_XLATE_NONE.BadTransDecl6.d \ err.D_XLATE_REDECL.RepeatTransDecl.d \ err.D_XLATE_SOU.BadTransDecl8.d \ err.D_XLATE_SOU.BadTransInt.d \ err.D_XLATE_SOU.NonExistentOutput1.d \ tst.CircularTransDecl.d \ tst.EmptyTransDecl.d \ tst.ForwardTag.d \ tst.InputAliasTrans.d \ tst.InputIntTrans.d \ tst.OutputAliasTrans.d \ tst.PartialDereferencing.d \ tst.PartialOutputTransDefn.d \ tst.ProcModelTrans.d \ tst.RepeatDeclaration.d \ tst.SimultaneousTranslators.d \ tst.StructureAssignment.d \ tst.TestTransStability1.ksh \ tst.TestTransStability1.ksh.out \ tst.TestTransStability2.ksh \ tst.TestTransStability2.ksh.out \ tst.TransNonPointer.d \ tst.TransOutputPointer.d \ tst.TransPointer.d \ tst.TranslateSelf.d \ tst.UnionInputTrans.d \ tst.UnionOutputTrans.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile (revision 291332) @@ -1,21 +1,21 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_DECL_IDRED.DupTypeDef.d \ err.D_SYNTAX.BadExistingTypedef.d \ err.D_SYNTAX.TypedefInClause.d \ tst.ChainTypedef.d \ tst.TypedefDataAssign.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/types/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/types/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/types/Makefile (revision 291332) @@ -1,69 +1,69 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_CAST_INVAL.badcast.d \ err.D_CG_DYN.ResultDynType.d \ err.D_CHR_OFLOW.charconst.d \ err.D_DECL_BADCLASS.bad.d \ err.D_DECL_CHARATTR.badtype3.d \ err.D_DECL_COMBO.badtype4.d \ err.D_DECL_COMBO.badtype5.d \ err.D_DECL_ENCONST.badeval.d \ err.D_DECL_ENOFLOW.enoflow.d \ err.D_DECL_ENOFLOW.enuflow.d \ err.D_DECL_SCOPE.scopeop.d \ err.D_DECL_USELESS.baddec.d \ err.D_OP_ACT.badcond.d \ err.D_OP_ARITH.badoperand.d \ err.D_OP_INCOMPAT.badassign.d \ err.D_OP_INT.badbitop.d \ err.D_OP_INT.badshift.d \ err.D_OP_SCALAR.badcond.d \ err.D_OP_SCALAR.badincop.d \ err.D_OP_SCALAR.badlogop.d \ err.D_PROTO_LEN.badcond1.d \ err.D_SYNTAX.badenum.d \ err.D_SYNTAX.badid.d \ err.D_SYNTAX.badstruct.d \ err.D_UNKNOWN.badtype1.d \ err.D_UNKNOWN.badtype2.d \ err.D_UNKNOWN.dupenum.d \ err.D_UNKNOWN.dupstruct.d \ err.D_XLATE_REDECL.ResultDynType.d \ tst.assignops.d \ tst.badshiftops.d \ tst.basics.d \ tst.basics.d.out \ tst.bitops.d \ tst.charconstants.d \ tst.complex.d \ tst.condexpr.d \ tst.const.d \ tst.constants.d \ tst.conv.d \ tst.enum.d \ tst.intincop.d \ tst.intops.d \ tst.inttypes.d \ tst.ptrincop.d \ tst.ptrops.d \ tst.relenum.d \ tst.relstring.d \ tst.shiftops.d \ tst.stringconstants.d \ tst.struct.d \ tst.typedef.d \ tst.unaryop.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile (revision 291332) @@ -1,41 +1,41 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.invalidpid.d \ err.invalidpid2.d \ err.invalidpid3.d \ err.invalidtype.ksh \ err.invalidtype2.ksh \ err.user64mode.ksh \ tst.aouttype.ksh \ tst.chasestrings.ksh \ tst.chasestrings.ksh.out \ tst.libtype.ksh \ tst.linkmap.ksh \ tst.pidprint.ksh \ tst.pidprinttarg.ksh \ tst.printtype.ksh \ tst.printtype.ksh.out \ tst.printtypetarg.ksh \ tst.userlandkey.ksh \ tst.userlandkey.ksh.out \ tst.userstrings.ksh \ tst.userstrings.ksh.out \ TESTEXES= \ CFILES= \ tst.aouttype.c \ tst.chasestrings.c \ tst.libtype.c \ tst.printtype.c \ WITH_CTF=YES -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/union/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/union/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/union/Makefile (revision 291332) @@ -1,27 +1,27 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ err.D_ADDROF_VAR.UnionPointer.d \ err.D_DECL_COMBO.UnionWithoutColon.d \ err.D_DECL_COMBO.UnionWithoutColon1.d \ err.D_DECL_INCOMPLETE.circular.d \ err.D_DECL_INCOMPLETE.order.d \ err.D_DECL_INCOMPLETE.recursive.d \ err.D_DECL_INCOMPLETE.simple.d \ err.D_PROTO_ARG.DupUnionAssoc.d \ tst.UnionAssoc.d \ tst.UnionDataTypes.d \ tst.UnionInside.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile (revision 291332) @@ -1,65 +1,65 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ argmap.d \ args.d \ forker.d \ prov.d \ tst.andpid.ksh \ tst.argmap.d \ tst.args.d \ tst.badguess.ksh \ tst.corruptenv.ksh \ tst.dlclose1.ksh \ tst.dlclose1.ksh.out \ tst.dlclose2.ksh \ tst.dlclose2.ksh.out \ tst.dlclose3.ksh \ tst.eliminate.ksh \ tst.enabled.ksh \ tst.enabled.ksh.out \ tst.enabled2.ksh \ tst.enabled2.ksh.out \ tst.entryreturn.ksh \ tst.entryreturn.ksh.out \ tst.fork.ksh \ tst.fork.ksh.out \ tst.forker.ksh \ tst.guess32.ksh \ tst.guess64.ksh \ tst.header.ksh \ tst.include.ksh \ tst.linkpriv.ksh \ tst.linkunpriv.ksh \ tst.multiple.ksh \ tst.multiple.ksh.out \ tst.multiprov.ksh \ tst.multiprov.ksh.out \ tst.nodtrace.ksh \ tst.noprobes.ksh \ tst.noreap.ksh \ tst.noreapring.ksh \ tst.onlyenabled.ksh \ tst.reap.ksh \ tst.reeval.ksh \ tst.static.ksh \ tst.static.ksh.out \ tst.static2.ksh \ tst.static2.ksh.out \ tst.user.ksh \ tst.user.ksh.out \ TESTEXES= \ CFILES= \ tst.argmap.c \ tst.args.c \ tst.forker.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile (revision 291332) @@ -1,20 +1,20 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.bigstack.d \ tst.depth.ksh \ tst.spin.ksh \ TESTEXES= \ CFILES= \ tst.bigstack.c \ tst.spin.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/vars/Makefile (revision 291332) @@ -1,23 +1,23 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.gid.d \ tst.nullassign.d \ tst.ppid.d \ tst.ucaller.ksh \ tst.ucaller.ksh.out \ tst.uid.d \ tst.walltimestamp.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/common/version/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/version/Makefile (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/common/version/Makefile (revision 291332) @@ -1,17 +1,17 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.1.0.d \ TESTEXES= \ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk =================================================================== --- head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (nonexistent) +++ head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (revision 291332) @@ -0,0 +1,48 @@ +# $FreeBSD$ + +TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} +TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} +TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} + +FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE + +${TESTGROUP}= ${TESTFILES} +${TESTGROUP}EXE= ${TESTEXES} +${TESTGROUP}EXEMODE= 0555 + +TESTWRAPPER= t_dtrace_contrib +ATF_TESTS_SH+= ${TESTWRAPPER} +TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" +TEST_METADATA.t_dtrace_contrib+= required_user="root" + +GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh +EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh +${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}} + sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} + +CLEANFILES+= ${TESTWRAPPER}.sh + +.PATH: ${TESTSRC} + +PROGS= ${CFILES:T:S/.c$/.exe/g} +.for prog in ${PROGS} +SRCS.${prog}+= ${prog:S/.exe$/.c/} + +.if exists(${prog:S/^tst.//:S/.exe$/.d/}) +SRCS.${prog}+= ${prog:S/^tst.//:S/.exe$/.d/} +.endif +.endfor + +BINDIR= ${TESTSDIR} +MAN= + +# Some tests depend on the internals of their corresponding test programs, +# so make sure the optimizer doesn't interfere with them. +CFLAGS+= -O0 + +# Test programs shouldn't be stripped; else we generally can't use the PID +# provider. +DEBUG_FLAGS= -g +STRIP= + +.include Property changes on: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh =================================================================== --- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 291331) +++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 291332) @@ -1,85 +1,85 @@ # $FreeBSD$ usage() { cat <<__EOF__ >&2 usage: $(basename $0) This script regenerates the DTrace test suite makefiles. It should be run whenever \$srcdir/cddl/contrib/opensolaris/cmd/dtrace/test/tst is modified. __EOF__ exit 1 } # Format a file list for use in a make(1) variable assignment: take the # basename of each input file and append " \" to it. fmtflist() { awk 'function bn(f) { sub(".*/", "", f) return f } {print " ", bn($1), " \\"}' } genmakefile() { local basedir=$1 local tdir=${CONTRIB_TESTDIR}/${basedir} local tfiles=$(find $tdir -type f -a \ \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist) local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist) local texes=$(find $tdir -type f -a -name \*.exe | sort | fmtflist) # One-off variable definitions. local special if [ "$basedir" = proc ]; then special=" LDADD.tst.sigwait.exe+= -lrt DPADD.tst.sigwait.exe+= \${LIBRT} " elif [ "$basedir" = uctf ]; then special=" WITH_CTF=YES " fi local makefile=$(mktemp) cat <<__EOF__ > $makefile # \$FreeBSD$ # # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh. # TESTFILES= \\ $tfiles TESTEXES= \\ $texes CFILES= \\ $tcfiles $special -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" __EOF__ mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile } set -e if [ $# -ne 0 ]; then usage fi readonly ORIGINDIR=$(realpath $(dirname $0)) readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..) readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common # Generate a Makefile for each test group under common/. for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do genmakefile $(basename $dir) done