diff options
author | rodrigc <rodrigc@FreeBSD.org> | 2008-11-05 19:35:09 +0000 |
---|---|---|
committer | rodrigc <rodrigc@FreeBSD.org> | 2008-11-05 19:35:09 +0000 |
commit | 9f34c4004df81e0f9ef5b1f40c4e24d9c220cf0d (patch) | |
tree | 0d63fb2a232ee601ee234ff3e8526ea1411a7f97 /cddl/contrib/opensolaris/cmd/dtrace | |
parent | 8a6828b297af8141ab3609d76007dfbdc128f0cd (diff) | |
download | FreeBSD-src-9f34c4004df81e0f9ef5b1f40c4e24d9c220cf0d.zip FreeBSD-src-9f34c4004df81e0f9ef5b1f40c4e24d9c220cf0d.tar.gz |
Merge latest DTrace changes from Perforce.
Approved by: jb
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/dtrace')
-rw-r--r-- | cddl/contrib/opensolaris/cmd/dtrace/dtrace.c | 2 | ||||
-rw-r--r-- | cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c index f909e22..2580e63 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c @@ -1576,7 +1576,7 @@ main(int argc, char *argv[]) if ((v = make_argv(optarg)) == NULL) fatal("failed to allocate memory"); - P = dtrace_proc_create(g_dtp, v[0], v); + P = dtrace_proc_create(g_dtp, v[0], v, NULL, NULL); if (P == NULL) dfatal(NULL); /* dtrace_errmsg() only */ diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst index f075618..261f870 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # Exception list: names tests that are bypassed when running in Java # mode (relative to /opt/SUNWdtrt/tst) @@ -49,6 +49,7 @@ common/usdt/tst.dlclose2.ksh common/usdt/tst.dlclose3.ksh common/usdt/tst.eliminate.ksh common/usdt/tst.enabled.ksh +common/usdt/tst.enabled2.ksh common/usdt/tst.entryreturn.ksh common/usdt/tst.fork.ksh common/usdt/tst.header.ksh |