PERFORCE change 132252 for review

[John Birrell]

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

Change 132252 by jb at jb_freebsd1 on 2008/01/01 20:04:59

	Set the path to the perl test script in it's new location now that
	it is distributed as part of OpenSolaris.

Affected files ...

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

Differences ...

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

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 TESTSRCDIR=	${.CURDIR}/../../../contrib/opensolaris/cmd/dtrace/test
+DTEST=		${TESTSRCDIR}/cmd/scripts/dtest.pl
 
 # Tests that should work:
 
@@ -1149,116 +1150,116 @@
 
 all	: test
 
-test	: ${TESTSRCDIR}/bin/dtest ${TESTFILES}
-	@${TESTSRCDIR}/bin/dtest ${TESTFILES}
+test	: ${DTEST} ${TESTFILES}
+	@${DTEST} ${TESTFILES}
 
 # --------------------------------------------------------------------------------
 # Convenience build targets:
 
-testaggs	: ${TESTSRCDIR}/bin/dtest ${TESTAGGS}
-	@${TESTSRCDIR}/bin/dtest ${TESTAGGS}
+testaggs	: ${DTEST} ${TESTAGGS}
+	@${DTEST} ${TESTAGGS}
 
-testarithmetic	: ${TESTSRCDIR}/bin/dtest ${TESTARITHMETIC}
-	@${TESTSRCDIR}/bin/dtest ${TESTARITHMETIC}
+testarithmetic	: ${DTEST} ${TESTARITHMETIC}
+	@${DTEST} ${TESTARITHMETIC}
 
-testarrays	: ${TESTSRCDIR}/bin/dtest ${TESTARRAYS}
-	@${TESTSRCDIR}/bin/dtest ${TESTARRAYS}
+testarrays	: ${DTEST} ${TESTARRAYS}
+	@${DTEST} ${TESTARRAYS}
 
-testassocs	: ${TESTSRCDIR}/bin/dtest ${TESTASSOCS}
-	@${TESTSRCDIR}/bin/dtest ${TESTASSOCS}
+testassocs	: ${DTEST} ${TESTASSOCS}
+	@${DTEST} ${TESTASSOCS}
 
-testbuiltinvar	: ${TESTSRCDIR}/bin/dtest ${TESTBUILTINVAR}
-	@${TESTSRCDIR}/bin/dtest ${TESTBUILTINVAR}
+testbuiltinvar	: ${DTEST} ${TESTBUILTINVAR}
+	@${DTEST} ${TESTBUILTINVAR}
 
-testfuncs	: ${TESTSRCDIR}/bin/dtest ${TESTFUNCS}
-	@${TESTSRCDIR}/bin/dtest ${TESTFUNCS}
+testfuncs	: ${DTEST} ${TESTFUNCS}
+	@${DTEST} ${TESTFUNCS}
 
-testgrammar	: ${TESTSRCDIR}/bin/dtest ${TESTGRAMMAR}
-	@${TESTSRCDIR}/bin/dtest ${TESTGRAMMAR}
+testgrammar	: ${DTEST} ${TESTGRAMMAR}
+	@${DTEST} ${TESTGRAMMAR}
 
-testinline	: ${TESTSRCDIR}/bin/dtest ${TESTINLINE}
-	@${TESTSRCDIR}/bin/dtest ${TESTINLINE}
+testinline	: ${DTEST} ${TESTINLINE}
+	@${DTEST} ${TESTINLINE}
 
-testmultiaggs	: ${TESTSRCDIR}/bin/dtest ${TESTMULTIAGGS}
-	@${TESTSRCDIR}/bin/dtest ${TESTMULTIAGGS}
+testmultiaggs	: ${DTEST} ${TESTMULTIAGGS}
+	@${DTEST} ${TESTMULTIAGGS}
 
-testlexer	: ${TESTSRCDIR}/bin/dtest ${TESTLEXER}
-	@${TESTSRCDIR}/bin/dtest ${TESTLEXER}
+testlexer	: ${DTEST} ${TESTLEXER}
+	@${DTEST} ${TESTLEXER}
 
-testoffsetof	: ${TESTSRCDIR}/bin/dtest ${TESTOFFSETOF}
-	@${TESTSRCDIR}/bin/dtest ${TESTOFFSETOF}
+testoffsetof	: ${DTEST} ${TESTOFFSETOF}
+	@${DTEST} ${TESTOFFSETOF}
 
-testoperators	: ${TESTSRCDIR}/bin/dtest ${TESTOPERATORS}
-	@${TESTSRCDIR}/bin/dtest ${TESTOPERATORS}
+testoperators	: ${DTEST} ${TESTOPERATORS}
+	@${DTEST} ${TESTOPERATORS}
 
-testpointers	: ${TESTSRCDIR}/bin/dtest ${TESTPOINTERS}
-	@${TESTSRCDIR}/bin/dtest ${TESTPOINTERS}
+testpointers	: ${DTEST} ${TESTPOINTERS}
+	@${DTEST} ${TESTPOINTERS}
 
-testpragma	: ${TESTSRCDIR}/bin/dtest ${TESTPRAGMA}
-	@${TESTSRCDIR}/bin/dtest ${TESTPRAGMA}
+testpragma	: ${DTEST} ${TESTPRAGMA}
+	@${DTEST} ${TESTPRAGMA}
 
-testpredicates	: ${TESTSRCDIR}/bin/dtest ${TESTPREDICATES}
-	@${TESTSRCDIR}/bin/dtest ${TESTPREDICATES}
+testpredicates	: ${DTEST} ${TESTPREDICATES}
+	@${DTEST} ${TESTPREDICATES}
 
-testpreprocessor: ${TESTSRCDIR}/bin/dtest ${TESTPREPROCESSOR}
-	@${TESTSRCDIR}/bin/dtest ${TESTPREPROCESSOR}
+testpreprocessor: ${DTEST} ${TESTPREPROCESSOR}
+	@${DTEST} ${TESTPREPROCESSOR}
 
-testprinta	: ${TESTSRCDIR}/bin/dtest ${TESTPRINTA}
-	@${TESTSRCDIR}/bin/dtest ${TESTPRINTA}
+testprinta	: ${DTEST} ${TESTPRINTA}
+	@${DTEST} ${TESTPRINTA}
 
-testprintf	: ${TESTSRCDIR}/bin/dtest ${TESTPRINTF}
-	@${TESTSRCDIR}/bin/dtest ${TESTPRINTF}
+testprintf	: ${DTEST} ${TESTPRINTF}
+	@${DTEST} ${TESTPRINTF}
 
-testprobes	: ${TESTSRCDIR}/bin/dtest ${TESTPROBES}
-	@${TESTSRCDIR}/bin/dtest ${TESTPROBES}
+testprobes	: ${DTEST} ${TESTPROBES}
+	@${DTEST} ${TESTPROBES}
 
-testproviders	: ${TESTSRCDIR}/bin/dtest ${TESTPROVIDERS}
-	@${TESTSRCDIR}/bin/dtest ${TESTPROVIDERS}
+testproviders	: ${DTEST} ${TESTPROVIDERS}
+	@${DTEST} ${TESTPROVIDERS}
 
-testsafety	: ${TESTSRCDIR}/bin/dtest ${TESTSAFETY}
-	@${TESTSRCDIR}/bin/dtest ${TESTSAFETY}
+testsafety	: ${DTEST} ${TESTSAFETY}
+	@${DTEST} ${TESTSAFETY}
 
-testscalars	: ${TESTSRCDIR}/bin/dtest ${TESTSCALARS}
-	@${TESTSRCDIR}/bin/dtest ${TESTSCALARS}
+testscalars	: ${DTEST} ${TESTSCALARS}
+	@${DTEST} ${TESTSCALARS}
 
-testsizeof	: ${TESTSRCDIR}/bin/dtest ${TESTSIZEOF}
-	@${TESTSRCDIR}/bin/dtest ${TESTSIZEOF}
+testsizeof	: ${DTEST} ${TESTSIZEOF}
+	@${DTEST} ${TESTSIZEOF}
 
-testspeculation	: ${TESTSRCDIR}/bin/dtest ${TESTSPECULATION}
-	@${TESTSRCDIR}/bin/dtest ${TESTSPECULATION}
+testspeculation	: ${DTEST} ${TESTSPECULATION}
+	@${DTEST} ${TESTSPECULATION}
 
-teststability	: ${TESTSRCDIR}/bin/dtest ${TESTSTABILITY}
-	@${TESTSRCDIR}/bin/dtest ${TESTSTABILITY}
+teststability	: ${DTEST} ${TESTSTABILITY}
+	@${DTEST} ${TESTSTABILITY}
 
-teststrlen	: ${TESTSRCDIR}/bin/dtest ${TESTSTRLEN}
-	@${TESTSRCDIR}/bin/dtest ${TESTSTRLEN}
+teststrlen	: ${DTEST} ${TESTSTRLEN}
+	@${DTEST} ${TESTSTRLEN}
 
-teststruct	: ${TESTSRCDIR}/bin/dtest ${TESTSTRUCT}
-	@${TESTSRCDIR}/bin/dtest ${TESTSTRUCT}
+teststruct	: ${DTEST} ${TESTSTRUCT}
+	@${DTEST} ${TESTSTRUCT}
 
-testtrace	: ${TESTSRCDIR}/bin/dtest ${TESTTRACE}
-	@${TESTSRCDIR}/bin/dtest ${TESTTRACE}
+testtrace	: ${DTEST} ${TESTTRACE}
+	@${DTEST} ${TESTTRACE}
 
-testtracemem	: ${TESTSRCDIR}/bin/dtest ${TESTTRACEMEM}
-	@${TESTSRCDIR}/bin/dtest ${TESTTRACEMEM}
+testtracemem	: ${DTEST} ${TESTTRACEMEM}
+	@${DTEST} ${TESTTRACEMEM}
 
-testtranslators	: ${TESTSRCDIR}/bin/dtest ${TESTTRANSLATORS}
-	@${TESTSRCDIR}/bin/dtest ${TESTTRANSLATORS}
+testtranslators	: ${DTEST} ${TESTTRANSLATORS}
+	@${DTEST} ${TESTTRANSLATORS}
 
-testtypedef	: ${TESTSRCDIR}/bin/dtest ${TESTTYPEDEF}
-	@${TESTSRCDIR}/bin/dtest ${TESTTYPEDEF}
+testtypedef	: ${DTEST} ${TESTTYPEDEF}
+	@${DTEST} ${TESTTYPEDEF}
 
-testtypes	: ${TESTSRCDIR}/bin/dtest ${TESTTYPES}
-	@${TESTSRCDIR}/bin/dtest ${TESTTYPES}
+testtypes	: ${DTEST} ${TESTTYPES}
+	@${DTEST} ${TESTTYPES}
 
-testunion	: ${TESTSRCDIR}/bin/dtest ${TESTUNION}
-	@${TESTSRCDIR}/bin/dtest ${TESTUNION}
+testunion	: ${DTEST} ${TESTUNION}
+	@${DTEST} ${TESTUNION}
 
-testvars	: ${TESTSRCDIR}/bin/dtest ${TESTVARS}
-	@${TESTSRCDIR}/bin/dtest ${TESTVARS}
+testvars	: ${DTEST} ${TESTVARS}
+	@${DTEST} ${TESTVARS}
 
-testversion	: ${TESTSRCDIR}/bin/dtest ${TESTVERSION}
-	@${TESTSRCDIR}/bin/dtest ${TESTVERSION}
+testversion	: ${DTEST} ${TESTVERSION}
+	@${DTEST} ${TESTVERSION}
 
 # --------------------------------------------------------------------------------
 # Tests that currently fail (but don't make the system go kaboom):
@@ -1314,8 +1315,8 @@
 	${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \
 	${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \
 
-notwork	: ${TESTSRCDIR}/bin/dtest ${NOTWORK}
-	@${TESTSRCDIR}/bin/dtest ${NOTWORK}
+notwork	: ${DTEST} ${NOTWORK}
+	@${DTEST} ${NOTWORK}
 
 REQUIRES_LIBPROC= \
 	${TESTSRCDIR}/tst/common/vars/tst.ucaller.ksh \
@@ -1381,15 +1382,15 @@
 	${TESTSRCDIR}/tst/common/inline/tst.InlineKinds.d \
 	${TESTSRCDIR}/tst/common/printa/tst.stack.d \
 
-testhang	: ${TESTSRCDIR}/bin/dtest ${TESTHANG}
-	@${TESTSRCDIR}/bin/dtest ${TESTHANG}
+testhang	: ${DTEST} ${TESTHANG}
+	@${DTEST} ${TESTHANG}
 
 # --------------------------------------------------------------------------------
 # Tests currently trying to fix...
 
 TESTTRY= \
 
-testtry	: ${TESTSRCDIR}/bin/dtest ${TESTTRY}
-	@${TESTSRCDIR}/bin/dtest ${TESTTRY}
+testtry	: ${DTEST} ${TESTTRY}
+	@${DTEST} ${TESTTRY}
 
 .include <bsd.obj.mk>