PERFORCE change 98306 for review

[John Birrell]

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

Change 98306 by jb at jb_freebsd2 on 2006/06/02 06:07:48

	Shuffle a few tests that now work.

Affected files ...

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

Differences ...

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

@@ -338,6 +338,15 @@
 	${.CURDIR}/tst/common/exit/err.exitarg1.d \
 	${.CURDIR}/tst/common/exit/tst.basic1.d
 
+TESTFBTPROVIDER= \
+	${.CURDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.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.return0.d
+
 TESTFUNCS= \
 	${.CURDIR}/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d \
 	${.CURDIR}/tst/common/funcs/err.D_OP_VFPTR.badop.d \
@@ -385,7 +394,8 @@
 	${.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
+	${.CURDIR}/tst/common/funcs/tst.substr.d \
+	${.CURDIR}/tst/common/funcs/tst.system.d
 
 TESTGRAMMAR= \
 	${.CURDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \
@@ -428,8 +438,10 @@
 TESTMULTIAGGS= \
 	${.CURDIR}/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d \
 	${.CURDIR}/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d \
+	${.CURDIR}/tst/common/multiaggs/tst.many.d \
 	${.CURDIR}/tst/common/multiaggs/tst.same.d \
 	${.CURDIR}/tst/common/multiaggs/tst.sort.d \
+	${.CURDIR}/tst/common/multiaggs/tst.tuplecompat.d \
 	${.CURDIR}/tst/common/multiaggs/tst.zero.d \
 	${.CURDIR}/tst/common/multiaggs/tst.zero2.d \
 	${.CURDIR}/tst/common/multiaggs/tst.zero3.d
@@ -898,18 +910,6 @@
 	${.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
@@ -1043,6 +1043,12 @@
 KABOOM= \
 	${.CURDIR}/tst/common/buffering/tst.alignring.d \
 	${.CURDIR}/tst/common/buffering/tst.cputime.ksh \
+	${.CURDIR}/tst/common/fbtprovider/tst.basic.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.return.d \
+	${.CURDIR}/tst/common/fbtprovider/tst.tailcall.d \
+	${.CURDIR}/tst/common/safety/tst.basename.d \
+	${.CURDIR}/tst/common/safety/tst.caller.d \
+	${.CURDIR}/tst/common/safety/tst.strchr.d \
 
 # --------------------------------------------------------------------------------
 # The normal test targets:
@@ -1064,6 +1070,7 @@
 	${TESTENUM} \
 	${TESTERROR} \
 	${TESTEXIT} \
+	${TESTFBTPROVIDER} \
 	${TESTFUNCS} \
 	${TESTGRAMMAR} \
 	${TESTINLINE} \
@@ -1291,8 +1298,6 @@
 REQUIRES_FBT= \
 	${.CURDIR}/tst/common/misc/tst.roch.d \
 	${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \
-	${.CURDIR}/tst/common/safety/tst.basename.d \
-	${.CURDIR}/tst/common/safety/tst.caller.d \
 	${.CURDIR}/tst/common/safety/tst.cleanpath.d \
 	${.CURDIR}/tst/common/safety/tst.ddi_pathname.d \
 	${.CURDIR}/tst/common/safety/tst.dirname.d \
@@ -1367,17 +1372,14 @@
 TESTHANG= \
 	${.CURDIR}/tst/common/aggs/tst.signature.d \
 	${.CURDIR}/tst/common/funcs/tst.chill.ksh \
-	${.CURDIR}/tst/common/funcs/tst.system.d \
 	${.CURDIR}/tst/common/inline/tst.InlineKinds.d \
 	${.CURDIR}/tst/common/misc/tst.enablerace.ksh \
-	${.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/speculation/tst.NoSpecBuffer.d \
-	${.CURDIR}/tst/common/tracemem/tst.rootvp.d
+	${.CURDIR}/tst/common/tracemem/tst.rootvp.d \
 
 testhang	: ${.CURDIR}/bin/dtest ${TESTHANG}
 	@${.CURDIR}/bin/dtest ${TESTHANG}