From owner-p4-projects@FreeBSD.ORG Tue Jan 8 04:54:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2A9216A421; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7CE016A41B for ; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC82113C4D3 for ; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m084sNCg081557 for ; Tue, 8 Jan 2008 04:54:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m084sNuP081554 for perforce@freebsd.org; Tue, 8 Jan 2008 04:54:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 04:54:23 GMT Message-Id: <200801080454.m084sNuP081554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 04:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132768 Change 132768 by jb@jb_freebsd1 on 2008/01/08 04:53:33 332 now. Automatically load the DTrace module set it it isn't loaded. I'm lazy. Load a module called 'dtrace_test' which will contain variables which are named according to the ones in Solaris that their test suite is coded to use. This will allow us to use their tests unaltered. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#6 (text+ko) ==== @@ -178,11 +178,6 @@ ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d TESTBUILTINVAR= \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0clause.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1.d \ @@ -195,17 +190,6 @@ ${TESTSRCDIR}/tst/common/builtinvar/tst.errno.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.errno1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.execname.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.id.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.id1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.pid.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.pid1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.tid.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.tid1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.timestamp.d \ @@ -234,7 +218,6 @@ ${TESTSRCDIR}/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d \ ${TESTSRCDIR}/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d \ ${TESTSRCDIR}/tst/common/decls/tst.arrays.d \ - ${TESTSRCDIR}/tst/common/decls/tst.basics.d \ ${TESTSRCDIR}/tst/common/decls/tst.funcs.d \ ${TESTSRCDIR}/tst/common/decls/tst.pointers.d \ ${TESTSRCDIR}/tst/common/decls/tst.varargsfuncs.d @@ -409,22 +392,17 @@ TESTGRAMMAR= \ ${TESTSRCDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \ ${TESTSRCDIR}/tst/common/grammar/err.D_EMPTY.empty.d \ - ${TESTSRCDIR}/tst/common/grammar/tst.clauses.d \ - ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d + ${TESTSRCDIR}/tst/common/grammar/tst.clauses.d TESTINLINE= \ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef1.d \ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef2.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_IDENT_UNDEF.recur.d \ ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d \ ${TESTSRCDIR}/tst/common/inline/tst.InlineWritableAssign.d TESTLEXER= \ - ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NULL.char.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_INT_OFLOW.BigInt.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace1.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace2.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack1.d \ @@ -432,15 +410,12 @@ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack3.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren1.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren2.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren3.d \ - ${TESTSRCDIR}/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh + ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren3.d TESTMISC= \ ${TESTSRCDIR}/tst/common/misc/err.D_PRAGMA_OPTSET.d \ ${TESTSRCDIR}/tst/common/misc/tst.badopt.d \ ${TESTSRCDIR}/tst/common/misc/tst.boolopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.enablerace.ksh \ ${TESTSRCDIR}/tst/common/misc/tst.haslam.d TESTMULTIAGGS= \ @@ -459,7 +434,6 @@ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d \ - ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofAlias.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofArith.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofUnion.d \ @@ -805,9 +779,7 @@ ${TESTSRCDIR}/tst/common/tick-n/tst.tickusec.d TESTTRACE= \ - ${TESTSRCDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ ${TESTSRCDIR}/tst/common/trace/err.D_PROTO_LEN.bad.d \ - ${TESTSRCDIR}/tst/common/trace/tst.misc.d \ ${TESTSRCDIR}/tst/common/trace/tst.qstring.d \ ${TESTSRCDIR}/tst/common/trace/tst.string.d @@ -1089,21 +1061,34 @@ ${TESTARRAYS} \ ${TESTBEGIN} \ ${TESTBITFIELDS} \ + ${TESTBUILTINVAR} \ + ${TESTCLAUSES} \ + ${TESTDECLS} \ ${TESTEND} \ ${TESTENUM} \ ${TESTERROR} \ ${TESTEXIT} \ + ${TESTFBTPROVIDER} \ + ${TESTGRAMMAR} \ ${TESTINLINE} \ + ${TESTLEXER} \ + ${TESTMISC} \ + ${TESTOFFSETOF} \ ${TESTOPERATORS} \ ${TESTPOINTERS} \ + ${TESTPRAGMA} \ ${TESTPREDICATES} \ ${TESTPREPROCESSOR} \ ${TESTPRINTF} \ ${TESTPROBES} \ ${TESTPROFILE} \ + ${TESTPROVIDERS} \ ${TESTSCALARS} \ ${TESTSIZEOF} \ ${TESTSTRLEN} \ + ${TESTTICK} \ + ${TESTTRACEMEM} \ + ${TESTTRACE} \ ${TESTTYPEDEF} \ ${TESTUNION} \ ${TESTVERSION} @@ -1112,29 +1097,16 @@ ${TESTAGGS} \ ${TESTASSOCS} \ ${TESTBUFFERING} \ - ${TESTBUILTINVAR} \ - ${TESTCLAUSES} \ ${TESTDROPS} \ ${TESTDTRACEUTIL} \ - ${TESTFBTPROVIDER} \ ${TESTFUNCS} \ - ${TESTLEXER} \ - ${TESTGRAMMAR} \ - ${TESTDECLS} \ - ${TESTMISC} \ ${TESTMULTIAGGS} \ - ${TESTOFFSETOF} \ ${TESTPRINTA} \ - ${TESTPRAGMA} \ - ${TESTPROVIDERS} \ ${TESTSAFETY} \ ${TESTSCRIPTING} \ ${TESTSPECULATION} \ ${TESTSTABILITY} \ ${TESTSTRUCT} \ - ${TESTTICK} \ - ${TESTTRACE} \ - ${TESTTRACEMEM} \ ${TESTTRANSLATORS} \ ${TESTVARS} \ ${TESTTYPES} \ @@ -1337,6 +1309,33 @@ # These need to be ported or a decision made as to why they don't apply to FreeBSD: SOLARIS_SPECIFIC= \ + ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ + ${TESTSRCDIR}/tst/common/misc/tst.enablerace.ksh \ + ${TESTSRCDIR}/tst/common/decls/tst.basics.d \ + ${TESTSRCDIR}/tst/common/inline/err.D_IDENT_UNDEF.recur.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.id.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.id1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.pid.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.pid1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ + ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \ + ${TESTSRCDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ + ${TESTSRCDIR}/tst/common/trace/tst.misc.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NULL.char.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ + ${TESTSRCDIR}/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh \ ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ @@ -1374,6 +1373,7 @@ # Tests that currently hang. TESTHANG= \ + ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d \ ${TESTSRCDIR}/tst/common/aggs/tst.signature.d \ ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh \ ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithID.d.ksh \ @@ -1410,5 +1410,12 @@ .error ERROR: You must run 'make obj' first! .endif +# -------------------------------------------------------------------------------- +# Load the DTrace module set if necessary. + +.BEGIN : + @if ! kldstat -q -m dtrace; then kldload dtraceall; fi + @if ! kldstat -q -m dtrace_test; then kldload dtrace_test; fi + .include