summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2015-05-17 23:09:58 +0000
committermarkj <markj@FreeBSD.org>2015-05-17 23:09:58 +0000
commit7037e8b85171408e098019c3a089cb502691a3a5 (patch)
tree430e3e9c2cb13662a983cc8553c8824fac4e52a3
parent78dbee31006a8fcbf453c24a21d6bb767e0ac43c (diff)
downloadFreeBSD-src-7037e8b85171408e098019c3a089cb502691a3a5.zip
FreeBSD-src-7037e8b85171408e098019c3a089cb502691a3a5.tar.gz
Fix a typo that snuck in with r283024, and remove the EXFAIL annotation from
a test which now passes as a result of that change.
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c2
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/exclude.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index 3bb14f7..f9b9625 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -1945,7 +1945,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
done:
dtrace_dof_destroy(dtp, dof);
-#ifdef illumos
+#ifdef __FreeBSD__
if (!dtp->dt_lazyload)
(void) unlink(tfile);
#endif
diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
index a42773d..33c9efc 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
@@ -38,7 +38,6 @@ exclude EXFAIL common/ip/tst.ipv4localudp.ksh
exclude EXFAIL common/mdb/tst.dtracedcmd.ksh
exclude EXFAIL common/misc/tst.dofmax.ksh
exclude EXFAIL common/misc/tst.include.ksh
-exclude EXFAIL common/pragma/tst.libchain.ksh
exclude EXFAIL common/safety/tst.copyin2.d
exclude EXFAIL common/safety/tst.msgdsize.d
exclude EXFAIL common/safety/tst.msgsize.d
OpenPOWER on IntegriCloud