diff options
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/dtrace')
82 files changed, 166 insertions, 194 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 907baee660b6..2d210a2cde84 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -21,7 +21,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 18, 2015 +.Dd October 5, 2013 .Dt DTRACE 1 .Os .Sh NAME @@ -670,8 +670,7 @@ Invalid command line options or arguments were specified. .Sh SEE ALSO .Xr cpp 1 , .Xr dtruss 1 , -.Xr elf 5 , -.Xr SDT 9 +.Xr elf 5 .Rs .%T Solaris Dynamic Tracing Guide .Re diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c index d8bdaa61faf4..3a954ed40482 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c @@ -43,11 +43,11 @@ #include <fcntl.h> #include <errno.h> #include <signal.h> -#ifdef illumos +#if defined(sun) #include <alloca.h> #endif #include <libgen.h> -#ifdef illumos +#if defined(sun) #include <libproc.h> #endif @@ -101,7 +101,7 @@ static int g_grabanon = 0; static const char *g_ofile = NULL; static FILE *g_ofp; static dtrace_hdl_t *g_dtp; -#ifdef illumos +#if defined(sun) static char *g_etcfile = "/etc/system"; static const char *g_etcbegin = "* vvvv Added by DTrace"; static const char *g_etcend = "* ^^^^ Added by DTrace"; @@ -211,7 +211,7 @@ fatal(const char *fmt, ...) static void dfatal(const char *fmt, ...) { -#if !defined(illumos) && defined(NEED_ERRLOC) +#if !defined(sun) && defined(NEED_ERRLOC) char *p_errfile = NULL; int errline = 0; #endif @@ -232,7 +232,7 @@ dfatal(const char *fmt, ...) (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } -#if !defined(illumos) && defined(NEED_ERRLOC) +#if !defined(sun) && defined(NEED_ERRLOC) dt_get_errloc(g_dtp, &p_errfile, &errline); if (p_errfile != NULL) printf("File '%s', line %d\n", p_errfile, errline); @@ -397,7 +397,7 @@ dof_prune(const char *fname) free(buf); } -#ifdef illumos +#if defined(sun) static void etcsystem_prune(void) { @@ -508,7 +508,7 @@ etcsystem_add(void) error("added forceload directives to %s\n", g_ofile); } -#endif /* illumos */ +#endif static void print_probe_info(const dtrace_probeinfo_t *p) @@ -643,7 +643,7 @@ anon_prog(const dtrace_cmd_t *dcp, dof_hdr_t *dof, int n) p = (uchar_t *)dof; q = p + dof->dofh_loadsz; -#ifdef illumos +#if defined(sun) oprintf("dof-data-%d=0x%x", n, *p++); while (p < q) @@ -793,7 +793,7 @@ compile_str(dtrace_cmd_t *dcp) static void prochandler(struct ps_prochandle *P, const char *msg, void *arg) { -#ifdef illumos +#if defined(sun) const psinfo_t *prp = Ppsinfo(P); int pid = Pstatus(P)->pr_pid; char name[SIG2STR_MAX]; @@ -807,13 +807,13 @@ prochandler(struct ps_prochandle *P, const char *msg, void *arg) return; } -#ifdef illumos +#if defined(sun) switch (Pstate(P)) { #else switch (proc_state(P)) { #endif case PS_UNDEAD: -#ifdef illumos +#if defined(sun) /* * Ideally we would like to always report pr_wstat here, but it * isn't possible given current /proc semantics. If we grabbed @@ -831,7 +831,7 @@ prochandler(struct ps_prochandle *P, const char *msg, void *arg) notice("pid %d terminated by %d\n", pid, WTERMSIG(wstatus)); #endif -#ifdef illumos +#if defined(sun) } else if (prp != NULL && WEXITSTATUS(prp->pr_wstat) != 0) { notice("pid %d exited with status %d\n", pid, WEXITSTATUS(prp->pr_wstat)); @@ -1238,7 +1238,7 @@ installsighands(void) if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGTERM, &act, NULL); -#ifndef illumos +#if !defined(sun) if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGPIPE, &act, NULL); @@ -1720,7 +1720,7 @@ main(int argc, char *argv[]) case DMODE_ANON: if (g_ofile == NULL) -#ifdef illumos +#if defined(sun) g_ofile = "/kernel/drv/dtrace.conf"; #else /* @@ -1732,7 +1732,7 @@ main(int argc, char *argv[]) #endif dof_prune(g_ofile); /* strip out any old DOF directives */ -#ifdef illumos +#if defined(sun) etcsystem_prune(); /* string out any forceload directives */ #endif @@ -1765,7 +1765,7 @@ main(int argc, char *argv[]) * that itself contains a #pragma D option quiet. */ error("saved anonymous enabling in %s\n", g_ofile); -#ifdef illumos +#if defined(sun) etcsystem_add(); error("run update_drv(1M) or reboot to enable changes\n"); #endif diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl index f32dbcefb6a5..db157415b62b 100755 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl @@ -273,7 +273,7 @@ sub run_tests { } $fullname = "$dir/$name"; - $exe = "$dir/$base.exe"; + $exe = "./$base.exe"; $exe_pid = -1; if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 || diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d index 63a850133b3f..b7ffbfa4329c 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d @@ -35,11 +35,11 @@ BEGIN this->b = -2; system("echo %s %d %d", "foo", this->a, this->b); - system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); + system("ping localhost"); system("echo %d", ++this->a); - system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); + system("ping localhost"); system("echo %d", ++this->a); - system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '"); + system("ping localhost"); system("echo %d", ++this->a); exit(0); } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out index fa61a5110615..cd0d735f0fb2 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out @@ -1,17 +1,8 @@ foo 9 -2 -PING localhost (127.0.0.1): 56 data bytes - ---- localhost ping statistics --- -1 packets transmitted, 1 packets received, 0.0% packet loss +localhost is alive 10 -PING localhost (127.0.0.1): 56 data bytes - ---- localhost ping statistics --- -1 packets transmitted, 1 packets received, 0.0% packet loss +localhost is alive 11 -PING localhost (127.0.0.1): 56 data bytes - ---- localhost ping statistics --- -1 packets transmitted, 1 packets received, 0.0% packet loss +localhost is alive 12 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d index 1ac1b459d511..a42afb747e97 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d @@ -38,4 +38,4 @@ * */ -inline dtrace_trap_func_t i = "i am a dtrace trap function"; +inline cyc_func_t i = "i am a cyclic function"; diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d index d67bdaf4e977..963b604839a3 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d @@ -38,4 +38,4 @@ * */ -inline struct vnode *invalid = xlate<psinfo_t>(curthread->td_proc); +inline vfs_t *invalid = xlate<psinfo_t>(curthread->t_procp); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c index 9b878a21b91d..3cded11e8529 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c @@ -26,8 +26,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/ioctl.h> - #include <assert.h> #include <setjmp.h> #include <signal.h> @@ -71,7 +69,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, 0, NULL); + (void) ioctl(-1, -1, NULL); } /* @@ -82,19 +80,20 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | - O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | + O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | + O_SYNC | O_TRUNC | O_XATTR, 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); /* * Once we have all the file descriptors in the state we want to test, - * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack + * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack * our DTrace script into recording the content of the fds[] array. */ for (i = 0; i < n; i++) - (void) ioctl(fds[i], 0, NULL); + (void) ioctl(fds[i], -1, NULL); assert(n <= sizeof (fds) / sizeof (fds[0])); exit(0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d index 86851421788c..52a3312da984 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d @@ -36,7 +36,7 @@ syscall::ioctl:entry } syscall::ioctl:entry -/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/ +/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/ { printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name); printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh index 18c774c58a50..0f2b64a2d902 100755 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh @@ -45,13 +45,12 @@ fi dtrace=$1 local=127.0.0.1 -$dtrace -c "/sbin/ping -q -c 1 -t 3 $local" -qs /dev/stdin <<EOF | sort -n | \ - grep -v -e '^round-trip ' -e '^--- ' +$dtrace -c "/sbin/ping $local 3" -qs /dev/stdin <<EOF | sort -n ip:::send /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("2 ip:::send ("); + printf("1 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, @@ -62,7 +61,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[4]->ipv4_protocol == IPPROTO_ICMP/ { - printf("3 ip:::receive ("); + printf("2 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[4]: %d %d %d %d %d)\n", args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags, diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out index c62b0c8e2557..41d6e0c8ad41 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out @@ -1,8 +1,6 @@ - -PING 127.0.0.1 (127.0.0.1): 56 data bytes -1 packets transmitted, 1 packets received, 0.0% packet loss -2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) -2 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 64) -3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) -3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64) +1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) +1 ip:::send (args[2]: 4 64, args[4]: 4 84 0 0 255) +2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) +2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255) +127.0.0.1 is alive diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh index 2e3ffec52ba6..c18dc7625d8e 100755 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh @@ -73,7 +73,6 @@ cat > test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $local port $tcpport" unless \$s; close \$s; - sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh index 65ede66f5fe9..e513ace0be64 100755 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh @@ -76,7 +76,6 @@ cat > test.pl <<-EOPERL Timeout => 3); die "Could not connect to host $dest port $tcpport" unless \$s; close \$s; - sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh index 65efd2420b76..f63d1ed766bc 100755 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh @@ -55,13 +55,12 @@ else removeinet6=0 fi -$dtrace -c "/sbin/ping6 -q -c 1 -X 3 $local" -qs /dev/stdin <<EOF | sort -n | \ - grep -v -e '^round-trip ' -e '^--- ' +$dtrace -c "/sbin/ping -A inet6 $local 3" -qs /dev/stdin <<EOF | sort -n ip:::send /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("2 ip:::send ("); + printf("1 ip:::send ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); @@ -71,7 +70,7 @@ ip:::receive /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/ { - printf("3 ip:::receive ("); + printf("2 ip:::receive ("); printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength); printf("args[5]: %d %d %d)\n", args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out index 2e94ff35de88..529d251fa06e 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out @@ -1,8 +1,6 @@ - -PING6(56=40+8+8 bytes) ::1 --> ::1 -1 packets transmitted, 1 packets received, 0.0% packet loss -2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) -2 ip:::send (args[2]: 6 16, args[5]: 6 0 16) -3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) -3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16) +::1 is alive +1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) +1 ip:::send (args[2]: 6 64, args[5]: 6 0 64) +2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) +2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh index 9668ad5868b8..5e0c7474065f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh @@ -79,7 +79,6 @@ cat > test.pl <<-EOPERL die "Could not connect to host $local port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; - sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh index 67712803d978..4bf4362b61d2 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh @@ -84,7 +84,6 @@ cat > test.pl <<-EOPERL die "Could not connect to host $dest port $tcpport" unless \$s; print \$s "testing state machine transitions"; close \$s; - sleep(2); EOPERL $dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c index 2a54d4974be0..307106d903b5 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c @@ -14,8 +14,6 @@ */ #include <sys/sdt.h> -#include <stdio.h> -#include <stdlib.h> #include "usdt.h" #define FMT "{" \ diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d index abae0c147b45..9c0280c97964 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d @@ -36,10 +36,8 @@ BEGIN { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winvalid-pp-token" + h = ' '; -#pragma clang diagnostic pop exit(0); } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d index 8cfbcc2bab36..aef5dab6f4fe 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d @@ -36,9 +36,7 @@ BEGIN { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winvalid-pp-token" + h = ''; exit(0); -#pragma clang diagnostic pop } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d index c83e0c505dd3..68b4cd42e4df 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d @@ -36,11 +36,9 @@ BEGIN { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winvalid-pp-token" + h = "hello there"; exit(0); -#pragma clang diagnostic pop } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh index 9aa0f68bfc86..30a2ce4175b3 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh @@ -31,6 +31,7 @@ if [ $# != 1 ]; then fi dtrace=$1 +CC=/usr/bin/gcc CFLAGS= doit() @@ -46,7 +47,7 @@ void main() {} EOF - if cc $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then + if $CC $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then $dtrace -xerrtags -C -s /dev/stdin \ >/dev/null 2>$errfile <<EOF #include <sys/$file> @@ -66,6 +67,11 @@ EOF rm -f $cofile $cfile 2>/dev/null } +if [ ! -x $CC ]; then + echo "$0: bad compiler: $CC" >& 2 + exit 1 +fi + concurrency=`psrinfo | wc -l` let concurrency=concurrency*4 let i=0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d index cf209efbab1f..67f446223462 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d @@ -74,13 +74,13 @@ fbt:::return (long long)curthread, pid, tid, (int)arg1, (int)arg0); } -mtx_lock:adaptive-acquire +mutex_enter:adaptive-acquire { printf(" %u 0x%llX %d %d lock:0x%llX", timestamp, (long long)curthread, pid, tid, arg0); } -mtx_unlock:adaptive-release +mutex_exit:adaptive-release { printf(" %u 0x%llX %d %d lock:0x%llX", timestamp, (long long) curthread, pid, tid, arg0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c index dda3ef28c0b0..bd89fffca676 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c @@ -28,7 +28,6 @@ #include <strings.h> #include <rpc/rpc.h> -#include <stdio.h> #include <stdlib.h> #include <sys/param.h> #include <rpcsvc/mount.h> diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d index 67d4bd9e1b1a..caf0a1d19384 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d @@ -40,5 +40,5 @@ BEGIN { - trace(offsetof(struct vnode, v_no_such_member)); + trace(offsetof(vnode_t, v_no_such_member)); } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe index e360d25b465b..595db1de33da 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c index 28d0677ca5d2..23bbab22f424 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> -#include <stdlib.h> #include <unistd.h> int diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe index ddd0f60f63ce..07e84583e74c 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/usr/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe index 6369bc561412..a8bc8cb351e9 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/usr/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d index 5be6d301d23f..f1b119785c97 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d @@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry proc:::create /pid == $1/ { - child = args[0]->p_pid; + child = args[0]->pr_pid; trace(pid); } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c index b3959c35e8b3..69df4723dc9f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c @@ -26,8 +26,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/types.h> -#include <sys/wait.h> #include <spawn.h> #include <signal.h> #include <stdio.h> diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh index ce29cd406bde..869339bafb25 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh @@ -66,5 +66,5 @@ $dtrace -s $tmpfile status=$? rm $tmpfile -pkill -P $$ sleep +pkill sleep exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh index 867fa36a9c15..8951cb381f8c 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh @@ -52,7 +52,7 @@ main.o: main.c cc -c main.c altlib.so: altlib.o - cc -shared -o altlib.so altlib.o -lc + cc -z defs -G -o altlib.so altlib.o -lc altlib.o: altlib.c cc -c altlib.c diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh index f8e9cafc03fe..49e362b33b20 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh @@ -44,7 +44,7 @@ mkdir $DIR cd $DIR cat > Makefile <<EOF -all: main + all: main main: main.o prov.o cc -o main main.o prov.o diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh index 26fb02596485..865b9bbee5fd 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh @@ -59,7 +59,7 @@ provmain.o: prov.d main.o $dtrace -G -32 -o provmain.o -s prov.d main.o altlib.so: altlib.o provalt.o - cc -shared -o altlib.so altlib.o provalt.o -lc + cc -z defs -G -o altlib.so altlib.o provalt.o -lc altlib.o: altlib.c prov.h cc -c altlib.c diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c index 12b3f724cb17..cfb88a83dc7f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> -#include <stdlib.h> #include <unistd.h> /* diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c index ea5394e120f5..b64aa0515daa 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> -#include <stdlib.h> #include <unistd.h> /* diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d index e8fc9b4dfba1..b31bb7f3b361 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d @@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry proc:::create /pid == $1/ { - child = args[0]->p_pid; + child = args[0]->pr_pid; } pid$1:a.out:go: @@ -54,7 +54,7 @@ pid$1:a.out:go: exit(1); } -syscall::exit:entry +syscall::rexit:entry /pid == $1/ { exit(0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c index 765c285dd964..1418f2a3fea4 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> -#include <stdlib.h> #include <unistd.h> /* diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c index 756745d99b1f..bb571d2ea33e 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> -#include <stdlib.h> #include <unistd.h> /* diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe index c767848bb25d..221e8b1d7434 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/usr/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe index c767848bb25d..221e8b1d7434 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe @@ -1,4 +1,4 @@ -#!/usr/bin/env ksh +#!/usr/bin/ksh # # CDDL HEADER START # diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d index bf2c6da7b18f..4f45885d42a3 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d @@ -25,7 +25,7 @@ BEGIN { - print((void)`proc0); + print((void)`p0); } BEGIN diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d index 6455dd629b8e..e8125d4f5cba 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d @@ -22,13 +22,13 @@ typedef struct pancakes { int i; string s; - struct timespec t; + timespec_t t; } pancakes_t; translator pancakes_t < void *V > { i = 2 * 10; s = strjoin("I like ", "pancakes"); - t = *(struct timespec *)`dtrace_zero; + t = *(timespec_t *)`dtrace_zero; }; BEGIN diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out index ed04f0a1ec72..9b01402af34b 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out @@ -1,7 +1,7 @@ pancakes_t { int i = 0x14 string s = [ "I like pancakes" ] - struct timespec t = { + timespec_t t = { time_t tv_sec = 0 long tv_nsec = 0 } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d index 1402b23ad6eb..3f54321df9de 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d @@ -44,7 +44,7 @@ BEGIN i = 0; } -syscall::*wait*:entry +syscall::*lwp*:entry { exit(0); } diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh index 5b948407a50b..5595c24aaa41 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh @@ -36,9 +36,8 @@ script() { $dtrace -s /dev/stdin <<EOF proc:::signal-discard - /args[1]->p_pid == $child && - xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" && - args[2] == SIGHUP/ + /args[1]->pr_pid == $child && + args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/ { exit(0); } @@ -49,7 +48,7 @@ killer() { while true; do sleep 1 - kill -HUP $child + /usr/bin/kill -HUP $child done } @@ -59,7 +58,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/bin/sleep 10000" +longsleep="/usr/bin/sleep 10000" /usr/bin/nohup $longsleep & child=$! diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh index 86bef7604480..8040ade6374b 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh @@ -48,7 +48,7 @@ sleeper() { while true; do $longsleep & - sleep 1 + /usr/bin/sleep 1 kill -9 $! done } @@ -59,7 +59,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/bin/sleep 10000" +longsleep="/usr/bin/sleep 10000" sleeper & child=$! @@ -67,9 +67,9 @@ child=$! script status=$? -kill -STOP $child +pstop $child pkill -P $child kill $child -kill -CONT $child +prun $child exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh index cb30eaeb8bb8..cd3c79180464 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh @@ -37,13 +37,12 @@ script() $dtrace -s /dev/stdin <<EOF proc:::signal-send /execname == "kill" && curpsinfo->pr_ppid == $child && - xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" && - args[2] == SIGUSR1/ + args[1]->pr_psargs == "$longsleep" && args[2] == SIGUSR1/ { /* * This is guaranteed to not race with signal-handle. */ - target = args[1]->p_pid; + target = args[1]->pr_pid; } proc:::signal-handle @@ -59,7 +58,7 @@ sleeper() while true; do $longsleep & sleep 1 - kill -USR1 $! + /usr/bin/kill -USR1 $! done } @@ -69,7 +68,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/bin/sleep 10000" +longsleep="/usr/bin/sleep 10000" sleeper & child=$! @@ -77,9 +76,9 @@ child=$! script status=$? -kill -STOP $child +pstop $child pkill -P $child kill $child -kill -CONT $child +prun $child exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh index 0fef3e363106..358d3625da39 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh @@ -60,14 +60,14 @@ spinny & child=$! # -# This is gutsy -- we're assuming that mtx_lock(9) will show up in the +# This is gutsy -- we're assuming that mutex_enter(9F) will show up in the # output. This is most likely _not_ to show up in the output if the # platform does not support arbitrary resolution interval timers -- but # the above script was stress-tested down to 100 hertz and still ran # successfully on all platforms, so one is hopeful that this test will pass # even in that case. # -script | tee /dev/fd/2 | grep mtx_lock > /dev/null +script | tee /dev/fd/2 | grep mutex_enter > /dev/null status=$? kill $child diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh index f62f6ed5a16f..4652ff32cd95 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh @@ -63,7 +63,7 @@ child=$! # The only thing we can be sure of is that some module named "unix" (or # "genunix") did some work -- so that's all we'll check. # -script | tee /dev/fd/2 | grep kernel > /dev/null +script | tee /dev/fd/2 | grep unix > /dev/null status=$? kill $child diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh index 2bea32ef2b04..218a651c9175 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh @@ -63,7 +63,7 @@ child=$! # This is the same gutsy test as that found in the func() test; see that # test for the rationale. # -script | tee /dev/fd/2 | grep mtx_lock > /dev/null +script | tee /dev/fd/2 | grep mutex_enter > /dev/null status=$? kill $child diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d index 036a6526fe7c..2fd69c698394 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d @@ -31,8 +31,8 @@ #pragma D option dynvarsize=1m struct bar { - pid_t pid; - struct thread *curthread; + int pid; + kthread_t *curthread; }; self struct bar foo[int]; diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh index 3c493dffa50d..cc1e6dd9f745 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh index 89c6a6aebb13..6ec078abf29d 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh @@ -42,7 +42,7 @@ fi dtrace=$1 -bname=`basename $0` +bname=`/usr/bin/basename $0` dfilename=/var/tmp/$bname.$$ diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh index 2397db6e1b72..afee24f83b71 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh @@ -43,7 +43,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/usr/bin/basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file @@ -77,7 +77,7 @@ fi #Get the groupid of the calling process using ps -groupid=`ps -x -o pid,egid | grep "$$ " | awk '{print $2}' 2>/dev/null` +groupid=`ps -o pid,pgid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -93,5 +93,5 @@ fi #Cleanup leftovers -rm -f $dfilename +/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh index 5bdc391dbbc0..1b6b9b3e0d39 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` +userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh index 0c4e77b54e4f..332b8e70d27d 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -groupid=`ps -x -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null` +groupid=`ps -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh index 37613ce1a5e1..bbd9a5364797 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file @@ -75,12 +75,12 @@ fi #Pass current pid (I mean parent pid for .d script). -$dfilename $$ #>/dev/null 2>&1 +$dfilename $$ >/dev/null 2>&1 if [ $? -ne 0 ]; then print -u2 "Error in executing $dfilename" exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh index e11f1e56b47d..62bc817af5f6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -projectid=`ps -x -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null` +projectid=`ps -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh index 08a65b2d62dc..477ebc0290a5 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -sessionid=`ps -x -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null` +sessionid=`ps -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get sid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh index a8b1ec1fe61e..724bd5fda7f0 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh index e4de7fbfd3d4..88b450d381ff 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -taskidval=`ps -x -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null` +taskidval=`ps -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh index 8cd6130ff644..fabf0eda7433 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`basename $0` +bname=`/bin/basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` +userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -rm -f $dfilename +#/bin/rm -f $dfilename exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c index 198d9db01b71..209160bd75f1 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c @@ -28,7 +28,6 @@ #include <stdio.h> #include <sys/syscall.h> -#include <unistd.h> /*ARGSUSED*/ int diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile new file mode 100644 index 000000000000..77fe870aa91f --- /dev/null +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile @@ -0,0 +1,13 @@ +all: main + +main: main.o prov.o + $(CC) -o main main.o prov.o + +main.o: main.c prov.h + $(CC) -c main.c + +prov.h: prov.d + /usr/sbin/dtrace -h -s prov.d + +prov.o: prov.d main.o + /usr/sbin/dtrace -G -32 -s prov.d main.o diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh index 696088c6d4a4..68dbb03456cc 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh @@ -48,7 +48,7 @@ fi dtrace="$1" startdir="$PWD" -dir=$(mktemp -d -t drtiXXXXXX) +dir=$(mktemp -td drtiXXXXXX) if (( $? != 0 )); then print -u2 'Could not create safe temporary directory' exit 2 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh index 5aaf9a0ab3fe..1c155febb5ae 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh @@ -53,7 +53,7 @@ main.o: main.c livelib.so: livelib.o prov.o - cc -shared -o livelib.so livelib.o prov.o -lc + cc -z defs -G -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h cc -c livelib.c @@ -66,7 +66,7 @@ prov.h: prov.d deadlib.so: deadlib.o - cc -shared -o deadlib.so deadlib.o -lc + cc -z defs -G -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c cc -c deadlib.c @@ -106,13 +106,11 @@ cat > main.c <<EOF #include <dlfcn.h> #include <unistd.h> #include <stdio.h> -#include <signal.h> int main(int argc, char **argv) { void *live; - sigset_t mask; if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) { printf("dlopen of livelib.so failed: %s\n", dlerror()); @@ -121,8 +119,7 @@ main(int argc, char **argv) (void) dlclose(live); - (void) sigemptyset(&mask); - (void) sigsuspend(&mask); + pause(); return (0); } @@ -136,7 +133,7 @@ fi script() { $dtrace -w -x bufsize=1k -c ./main -qs /dev/stdin <<EOF - syscall::sigsuspend:entry + syscall::pause:entry /pid == \$target/ { system("$dtrace -l -P test_prov*"); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh index 6ce1329c6ed2..107707ede32e 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh @@ -48,7 +48,7 @@ main.o: main.c livelib.so: livelib.o prov.o - cc -shared -o livelib.so livelib.o prov.o -lc + cc -z defs -G -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h cc -c livelib.c @@ -61,7 +61,7 @@ prov.h: prov.d deadlib.so: deadlib.o - cc -shared -o deadlib.so deadlib.o -lc + cc -z defs -G -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c cc -c deadlib.c diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh index ad668cc1e772..a750b59e14e6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh @@ -53,7 +53,7 @@ main.o: main.c livelib.so: livelib.o prov.o - cc -shared -o livelib.so livelib.o prov.o -lc + cc -z defs -G -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h cc -c livelib.c @@ -66,7 +66,7 @@ prov.h: prov.d deadlib.so: deadlib.o - cc -shared -o deadlib.so deadlib.o -lc + cc -z defs -G -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c cc -c deadlib.c diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c index e229c0c996a8..ade7f83b3d53 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c @@ -26,10 +26,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include <sys/types.h> -#include <sys/wait.h> - -#include <stdlib.h> #include <unistd.h> #include "forker.h" diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh index bf267c7c27f4..7def9ed2abce 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh @@ -102,5 +102,5 @@ if [ $? -ne 0 ]; then fi cd / -rm -rf $DIR +/usr/bin/rm -rf $DIR exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh index 2c1aedcdece4..a43970f56072 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh @@ -55,5 +55,5 @@ if [ $? -eq 0 ]; then fi cd / -rm -rf $DIR +/usr/bin/rm -rf $DIR exit 0 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh index 905fb5538fc8..338dcdf03e6f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh @@ -51,7 +51,7 @@ provider test_prov { }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -cc -o test test.o prov.o +gcc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 @@ -123,6 +123,6 @@ else fi cd / -rm -rf $DIR +/usr/bin/rm -rf $DIR exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh index 2afd78165fc4..a2e5edee3814 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh @@ -51,7 +51,7 @@ provider test_prov { }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -cc -o test test.o prov.o +gcc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 @@ -119,6 +119,6 @@ fi kill $background cd / -rm -rf $DIR +/usr/bin/rm -rf $DIR exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh index 4f6c0ac87d97..f18c585ef6c8 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh @@ -51,7 +51,7 @@ provider test_prov { }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -cc -o test test.o prov.o +gcc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 @@ -110,6 +110,6 @@ grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 status=$? cd / -rm -rf $DIR +/usr/bin/rm -rf $DIR exit $status |