PERFORCE change 97038 for review

John Birrell jb at FreeBSD.org
Fri May 12 23:35:28 UTC 2006 

http://perforce.freebsd.org/chv.cgi?CH=97038

Change 97038 by jb at jb_freebsd2 on 2006/05/12 23:35:05

	We're up to a test pass count of 642 now. This commit reflects that,
	however it mostly groups the tests that fail into groups according
	to the work needed to many them work. The majority of these are
	builtin variables that need to be ported to FreeBSD. Things like
	'curpsinfo', for instance, are implemented in D library scripts that
	I haven't ported yet. I guess that's next. 8-)
	
	Some of the test failures are due to shell scripts which contain
	code which FreeBSD's 'sh' handles differently to Solaris' 'ksh'.

Affected files ...

.. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#2 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#2 (text+ko) ====

@@ -81,6 +81,7 @@
 	${.CURDIR}/tst/common/aggs/tst.lquantzero.d \
 	${.CURDIR}/tst/common/aggs/tst.max.d \
 	${.CURDIR}/tst/common/aggs/tst.min.d \
+	${.CURDIR}/tst/common/aggs/tst.multiaggs1.d \
 	${.CURDIR}/tst/common/aggs/tst.multiaggs2.d \
 	${.CURDIR}/tst/common/aggs/tst.multiaggs3.d \
 	${.CURDIR}/tst/common/aggs/tst.multinormalize.d \
@@ -157,12 +158,17 @@
 
 TESTBUILTINVAR= \
 	${.CURDIR}/tst/common/builtinvar/tst.arg0.d \
+	${.CURDIR}/tst/common/builtinvar/tst.arg0clause.d \
 	${.CURDIR}/tst/common/builtinvar/tst.arg1.d \
 	${.CURDIR}/tst/common/builtinvar/tst.arg1to8.d \
+	${.CURDIR}/tst/common/builtinvar/tst.arg1to8clause.d \
 	${.CURDIR}/tst/common/builtinvar/tst.epid.d \
 	${.CURDIR}/tst/common/builtinvar/tst.epid1.d \
+	${.CURDIR}/tst/common/builtinvar/tst.execname.d \
 	${.CURDIR}/tst/common/builtinvar/tst.id.d \
 	${.CURDIR}/tst/common/builtinvar/tst.id1.d \
+	${.CURDIR}/tst/common/builtinvar/tst.pid.d \
+	${.CURDIR}/tst/common/builtinvar/tst.pid1.d \
 	${.CURDIR}/tst/common/builtinvar/tst.tid.d \
 	${.CURDIR}/tst/common/builtinvar/tst.tid1.d \
 	${.CURDIR}/tst/common/builtinvar/tst.timestamp.d \
@@ -262,11 +268,19 @@
 	${.CURDIR}/tst/common/funcs/err.copyoutbadaddr.ksh \
 	${.CURDIR}/tst/common/funcs/err.copyoutstrbadaddr.ksh \
 	${.CURDIR}/tst/common/funcs/tst.badfreopen.ksh \
+	${.CURDIR}/tst/common/funcs/tst.basename.d \
+	${.CURDIR}/tst/common/funcs/tst.cleanpath.d \
 	${.CURDIR}/tst/common/funcs/tst.default.d \
 	${.CURDIR}/tst/common/funcs/tst.ftruncate.ksh \
+	${.CURDIR}/tst/common/funcs/tst.index.d \
+	${.CURDIR}/tst/common/funcs/tst.lltostr.d \
+	${.CURDIR}/tst/common/funcs/tst.progenyof.d \
 	${.CURDIR}/tst/common/funcs/tst.rand.d \
 	${.CURDIR}/tst/common/funcs/tst.strchr.d \
-	${.CURDIR}/tst/common/funcs/tst.strjoin.d
+	${.CURDIR}/tst/common/funcs/tst.strjoin.d \
+	${.CURDIR}/tst/common/funcs/tst.strstr.d \
+	${.CURDIR}/tst/common/funcs/tst.strtok.d \
+	${.CURDIR}/tst/common/funcs/tst.substr.d
 
 TESTGRAMMAR= \
 	${.CURDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \
@@ -839,6 +853,24 @@
 	${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh \
 	${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh
 
+TESTFASTTRAP= \
+	${.CURDIR}/tst/common/fasttrap/tst.fasttrap.d \
+	${.CURDIR}/tst/common/fasttrap/tst.fasttrap.exe \
+	${.CURDIR}/tst/common/fasttrap/tst.stack.d \
+	${.CURDIR}/tst/common/fasttrap/tst.stack.exe
+
+TESTFBTPROVIDER= \
+	${.CURDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.basic.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.functionentry.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.functionreturnvalue.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.ioctlargs.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.offset.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.offsetzero.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.return.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.return0.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.tailcall.d
+
 TESTIO= \
 	${.CURDIR}/tst/common/io/tst.fds.d \
 	${.CURDIR}/tst/common/io/tst.fds.exe
@@ -1201,85 +1233,18 @@
 # Tests that currently fail (but don't make the system go kaboom):
 
 NOTWORK= \
-	${TESTSAFETY} \
-	${.CURDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \
 	${.CURDIR}/tst/common/aggs/tst.neglquant.d \
 	${.CURDIR}/tst/common/aggs/tst.negquant.d \
 	${.CURDIR}/tst/common/aggs/tst.subr.d \
 	${.CURDIR}/tst/common/arrays/tst.uregsarray.d \
-	${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \
-	${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \
-	${.CURDIR}/tst/common/assocs/tst.orthogonality.d \
-	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \
-	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \
-	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \
-	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \
-	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \
-	${.CURDIR}/tst/common/builtinvar/tst.errno.d \
-	${.CURDIR}/tst/common/builtinvar/tst.errno1.d \
-	${.CURDIR}/tst/common/builtinvar/tst.execname.d \
-	${.CURDIR}/tst/common/builtinvar/tst.hpriority.d \
-	${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo.d \
-	${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \
-	${.CURDIR}/tst/common/builtinvar/tst.psinfo.d \
-	${.CURDIR}/tst/common/builtinvar/tst.psinfo1.d \
 	${.CURDIR}/tst/common/decls/tst.basics.d \
 	${.CURDIR}/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \
 	${.CURDIR}/tst/common/error/tst.DTRACEFLT_BADADDR.d \
 	${.CURDIR}/tst/common/error/tst.DTRACEFLT_UNKNOWN.d \
-	${.CURDIR}/tst/common/fasttrap/tst.fasttrap.d \
-	${.CURDIR}/tst/common/fasttrap/tst.fasttrap.exe \
-	${.CURDIR}/tst/common/fasttrap/tst.stack.d \
-	${.CURDIR}/tst/common/fasttrap/tst.stack.exe \
-	${.CURDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.basic.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.functionentry.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.functionreturnvalue.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.ioctlargs.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.offset.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.offsetzero.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.return.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.return0.d \
-	${.CURDIR}/tst/common/fbtprovider/tst.tailcall.d \
-	${.CURDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \
-	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \
-	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \
-	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \
-	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \
-	${.CURDIR}/tst/common/funcs/tst.bcopy.d \
-	${.CURDIR}/tst/common/funcs/tst.cleanpath.d \
-	${.CURDIR}/tst/common/funcs/tst.copyin.d \
-	${.CURDIR}/tst/common/funcs/tst.copyinto.d \
-	${.CURDIR}/tst/common/funcs/tst.ddi_pathname.d \
-	${.CURDIR}/tst/common/funcs/tst.freopen.ksh \
-	${.CURDIR}/tst/common/funcs/tst.index.d \
-	${.CURDIR}/tst/common/funcs/tst.mutex_owned.d \
-	${.CURDIR}/tst/common/funcs/tst.mutex_owner.d \
-	${.CURDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \
-	${.CURDIR}/tst/common/funcs/tst.progenyof.d \
-	${.CURDIR}/tst/common/funcs/tst.strstr.d \
-	${.CURDIR}/tst/common/funcs/tst.strtok.d \
-	${.CURDIR}/tst/common/funcs/tst.substr.d \
-	${.CURDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \
-	${.CURDIR}/tst/common/inline/tst.InlineDataAssign.d \
-	${.CURDIR}/tst/common/inline/tst.InlineExpression.d \
-	${.CURDIR}/tst/common/inline/tst.InlineTypedef.d \
-	${.CURDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \
-	${.CURDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \
-	${.CURDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \
-	${.CURDIR}/tst/common/pointers/tst.GlobalVar.d \
-	${.CURDIR}/tst/common/pointers/tst.basic1.d \
-	${.CURDIR}/tst/common/pointers/tst.basic2.d \
-	${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \
-	${.CURDIR}/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \
-	${.CURDIR}/tst/common/printa/tst.many.d \
 	${.CURDIR}/tst/common/printa/tst.walltimestamp.d \
 	${.CURDIR}/tst/common/printf/tst.basics.d \
 	${.CURDIR}/tst/common/printf/tst.printT.d \
 	${.CURDIR}/tst/common/printf/tst.printY.d \
-	${.CURDIR}/tst/common/printf/tst.str.d \
-	${.CURDIR}/tst/common/printf/tst.sym.d \
-	${.CURDIR}/tst/common/probes/tst.probestar.d \
 	${.CURDIR}/tst/common/profile-n/tst.argtest.d \
 	${.CURDIR}/tst/common/profile-n/tst.func.ksh \
 	${.CURDIR}/tst/common/profile-n/tst.mod.ksh \
@@ -1287,14 +1252,6 @@
 	${.CURDIR}/tst/common/profile-n/tst.ufunc.ksh \
 	${.CURDIR}/tst/common/profile-n/tst.umod.ksh \
 	${.CURDIR}/tst/common/profile-n/tst.usym.ksh \
-	${.CURDIR}/tst/common/providers/tst.beginprof.d \
-	${.CURDIR}/tst/common/providers/tst.probattrs.d \
-	${.CURDIR}/tst/common/providers/tst.probefunc.d \
-	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \
-	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \
-	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \
-	${.CURDIR}/tst/common/scalars/tst.misc.d \
-	${.CURDIR}/tst/common/scalars/tst.selfarray2.d \
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d \
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d \
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d \
@@ -1302,54 +1259,135 @@
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d \
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \
 	${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \
-	${.CURDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \
 	${.CURDIR}/tst/common/trace/tst.misc.d \
 	${.CURDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \
 	${.CURDIR}/tst/common/translators/tst.ProcModelTrans.d \
-	${.CURDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \
 	${.CURDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \
 	${.CURDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \
-	${.CURDIR}/tst/common/types/tst.complex.d \
-	${.CURDIR}/tst/common/types/tst.ptrincop.d \
-	${.CURDIR}/tst/common/types/tst.ptrops.d \
+
+notwork	: ${.CURDIR}/bin/dtest ${NOTWORK}
+	@${.CURDIR}/bin/dtest ${NOTWORK}
+
+REQUIRES_CURPSINFO= \
+	${.CURDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \
+	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \
+	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \
+	${.CURDIR}/tst/common/builtinvar/tst.psinfo.d \
+	${.CURDIR}/tst/common/builtinvar/tst.psinfo1.d \
+	${.CURDIR}/tst/common/funcs/tst.copyin.d \
+	${.CURDIR}/tst/common/funcs/tst.copyinto.d \
 	${.CURDIR}/tst/common/types/tst.struct.d \
 	${.CURDIR}/tst/common/types/tst.typedef.d \
 	${.CURDIR}/tst/common/vars/tst.gid.d \
 	${.CURDIR}/tst/common/vars/tst.ppid.d \
-	${.CURDIR}/tst/common/vars/tst.ucaller.ksh \
 	${.CURDIR}/tst/common/vars/tst.uid.d
 
-notwork	: ${.CURDIR}/bin/dtest ${NOTWORK}
-	@${.CURDIR}/bin/dtest ${NOTWORK}
+REQUIRES_CURLWPSINFO= \
+	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \
+	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \
+	${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \
+	${.CURDIR}/tst/common/builtinvar/tst.hpriority.d \
+	${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo.d \
+	${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo1.d
+
+REQUIRES_CURTHREAD= \
+	${.CURDIR}/tst/common/assocs/tst.orthogonality.d \
+	${.CURDIR}/tst/common/scalars/tst.selfarray2.d \
+	${.CURDIR}/tst/common/types/tst.complex.d
+
+REQUIRES_ERRNO= \
+	${.CURDIR}/tst/common/builtinvar/tst.errno.d \
+	${.CURDIR}/tst/common/builtinvar/tst.errno1.
+
+REQUIRES_FBT= \
+	${.CURDIR}/tst/common/predicates/tst.argsnotcached.d
+
+REQUIRES_KMEM_FLAGS= \
+	${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \
+	${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \
+	${.CURDIR}/tst/common/funcs/tst.bcopy.d \
+	${.CURDIR}/tst/common/inline/tst.InlineDataAssign.d \
+	${.CURDIR}/tst/common/inline/tst.InlineExpression.d \
+	${.CURDIR}/tst/common/inline/tst.InlineTypedef.d \
+	${.CURDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \
+	${.CURDIR}/tst/common/pointers/tst.GlobalVar.d \
+	${.CURDIR}/tst/common/pointers/tst.basic1.d \
+	${.CURDIR}/tst/common/pointers/tst.basic2.d \
+	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \
+	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \
+	${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \
+	${.CURDIR}/tst/common/scalars/tst.misc.d \
+	${.CURDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \
+	${.CURDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \
+	${.CURDIR}/tst/common/types/tst.ptrincop.d \
+	${.CURDIR}/tst/common/types/tst.ptrops.d
+
+REQUIRES_LIBPROC= \
+	${.CURDIR}/tst/common/vars/tst.ucaller.ksh
+
+REQUIRES_ROOTFS= \
+	${.CURDIR}/tst/common/printf/tst.str.d
+
+REQUIRES_TCP_T= \
+	${.CURDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d
+
+REQUIRES_VFS_T= \
+	${.CURDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d
+
+REQUIRES_VNODE_T= \
+	${.CURDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d
+
+# --------------------------------------------------------------------------------
+# These need to be ported or a decision made as to why they don't apply to FreeBSD:
+
+SOLARIS_SPECIFIC= \
+	${.CURDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \
+	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \
+	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \
+	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \
+	${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \
+	${.CURDIR}/tst/common/funcs/tst.ddi_pathname.d \
+	${.CURDIR}/tst/common/funcs/tst.freopen.ksh \
+	${.CURDIR}/tst/common/funcs/tst.mutex_owned.d \
+	${.CURDIR}/tst/common/funcs/tst.mutex_owner.d \
+	${.CURDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \
+	${.CURDIR}/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \
+	${.CURDIR}/tst/common/printf/tst.sym.d \
+	${.CURDIR}/tst/common/probes/tst.probestar.d \
 
 # --------------------------------------------------------------------------------
 # Tests that currently hang.
 
 TESTHANG= \
-	${.CURDIR}/tst/common/aggs/tst.multiaggs1.d \
 	${.CURDIR}/tst/common/aggs/tst.signature.d \
-	${.CURDIR}/tst/common/builtinvar/tst.arg0clause.d \
-	${.CURDIR}/tst/common/builtinvar/tst.arg1to8clause.d \
 	${.CURDIR}/tst/common/builtinvar/tst.caller.d \
 	${.CURDIR}/tst/common/builtinvar/tst.caller1.d \
 	${.CURDIR}/tst/common/builtinvar/tst.ipl.d \
 	${.CURDIR}/tst/common/builtinvar/tst.ipl1.d \
-	${.CURDIR}/tst/common/builtinvar/tst.pid.d \
-	${.CURDIR}/tst/common/builtinvar/tst.pid1.d \
-	${.CURDIR}/tst/common/funcs/tst.basename.d \
 	${.CURDIR}/tst/common/funcs/tst.chill.ksh \
-	${.CURDIR}/tst/common/funcs/tst.lltostr.d \
 	${.CURDIR}/tst/common/funcs/tst.system.d \
 	${.CURDIR}/tst/common/inline/tst.InlineKinds.d \
 	${.CURDIR}/tst/common/multiaggs/tst.many.d \
 	${.CURDIR}/tst/common/multiaggs/tst.sortpos.d \
 	${.CURDIR}/tst/common/multiaggs/tst.tuplecompat.d \
 	${.CURDIR}/tst/common/predicates/tst.predcache.ksh \
+	${.CURDIR}/tst/common/printa/tst.many.d \
 	${.CURDIR}/tst/common/printa/tst.stack.d \
+	${.CURDIR}/tst/common/providers/tst.beginprof.d \
+	${.CURDIR}/tst/common/providers/tst.probattrs.d \
+	${.CURDIR}/tst/common/providers/tst.probefunc.d \
 	${.CURDIR}/tst/common/speculation/tst.NoSpecBuffer.d \
 	${.CURDIR}/tst/common/tracemem/tst.rootvp.d
 
 testhang	: ${.CURDIR}/bin/dtest ${TESTHANG}
 	@${.CURDIR}/bin/dtest ${TESTHANG}
 
+# --------------------------------------------------------------------------------
+# Tests currently trying to fix...
+
+TESTTRY= \
+
+testtry	: ${.CURDIR}/bin/dtest ${TESTTRY}
+	@${.CURDIR}/bin/dtest ${TESTTRY}
+
 .include <bsd.obj.mk>

More information about the p4-projects mailing list