summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2017-11-28 01:16:41 +0000
committermarkj <markj@FreeBSD.org>2017-11-28 01:16:41 +0000
commitf2a332b8420a668e47d511c83aabbb8c8ba04814 (patch)
tree12efe26fde590f23a29a65dfe849011f2a3b99b3
parent7c0a4b882cc085021028de6771f4b5752f279833 (diff)
downloadFreeBSD-src-f2a332b8420a668e47d511c83aabbb8c8ba04814.zip
FreeBSD-src-f2a332b8420a668e47d511c83aabbb8c8ba04814.tar.gz
MFC r326061, r326063:
DTrace test fixups.
-rw-r--r--cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d2
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/exclude.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d
index 829c002..a27d721 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d
@@ -33,6 +33,6 @@
*
*/
-pid$1:a.out:main:beginning
+pid$1:a.out::beginning
{
}
diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
index e839029..7ac2958 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
@@ -183,6 +183,9 @@ exclude EXFAIL common/usdt/tst.badguess.ksh
exclude EXFAIL common/usdt/tst.guess32.ksh
exclude EXFAIL common/usdt/tst.guess64.ksh
+# Depends on non-standard static linker behaviour.
+exclude EXFAIL common/usdt/tst.eliminate.ksh
+
# Generated headers include <sys/sdt.h>, so _DTRACE_VERSION is always defined.
exclude EXFAIL common/usdt/tst.nodtrace.ksh
OpenPOWER on IntegriCloud