Mercurial > illumos > illumos-gate
changeset 13453:f98cb16f36d8
1453 dtest should fail if dependencies are missing
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
line wrap: on
line diff
--- a/usr/src/cmd/dtrace/test/cmd/scripts/Makefile Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/cmd/scripts/Makefile Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include $(SRC)/Makefile.master @@ -32,7 +31,7 @@ ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt ROOTBIN = $(ROOTOPTPKG)/bin -SRCS = dtest itest dstyle +SRCS = dtest itest dstyle dtfailures CMDS = $(SRCS:%=$(ROOTBIN)/%) $(CMDS) := FILEMODE = 0555
--- a/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl Thu Jun 30 22:33:31 2011 -0700 @@ -25,6 +25,9 @@ # Use is subject to license terms. # +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# require 5.8.4; use File::Find; @@ -35,8 +38,8 @@ $PNAME = $0; $PNAME =~ s:.*/::; -$OPTSTR = 'abd:fghi:jlnqsx:'; -$USAGE = "Usage: $PNAME [-abfghjlnqs] [-d dir] [-i isa] " +$OPTSTR = 'abd:fFghi:jlnqsx:'; +$USAGE = "Usage: $PNAME [-abfFghjlnqs] [-d dir] [-i isa] " . "[-x opt[=arg]] [file | dir ...]\n"; ($MACH = `uname -p`) =~ s/\W*\n//; ($PLATFORM = `uname -i`) =~ s/\W*\n//; @@ -69,6 +72,20 @@ return $i == -1 ? '.' : $i == 0 ? '/' : $s; } +sub inpath +{ + my ($exec) = (@_); + my @path = File::Spec->path(); + + for my $dir (@path) { + if (-x $dir . "/" . $exec) { + return 1; + } + } + + return 0; +} + sub usage { print $USAGE; @@ -77,6 +94,7 @@ print "\t -d specify directory for test results files and cores\n"; print "\t -g enable libumem debugging when running tests\n"; print "\t -f force bypassed tests to run\n"; + print "\t -F force tests to be run, even if missing dependencies\n"; print "\t -h display verbose usage message\n"; print "\t -i specify ISA to test instead of isaexec(3C) default\n"; print "\t -j execute test suite using jdtrace (Java API) only\n"; @@ -240,8 +258,8 @@ my($failed) = $errs; my($total) = 0; - die "$PNAME: $dtrace not found\n" unless (-x "$dtrace"); - logmsg($dtrace . "\n"); + die "$PNAME: $dtrace not found; aborting\n" unless (-x "$dtrace"); + logmsg("executing tests using $dtrace ...\n"); load_exceptions($exceptions_path); @@ -546,9 +564,20 @@ $defdir = -d $dt_tst ? $dt_tst : '.'; $bindir = -d $dt_bin ? $dt_bin : '.'; +if (!$opt_F) { + my @dependencies = ("gcc", "make", "java", "perl"); + + for my $dep (@dependencies) { + if (!inpath($dep)) { + die "$PNAME: '$dep' not found (use -F to force run)\n"; + } + } +} + find(\&wanted, "$defdir/common") if (scalar(@ARGV) == 0); find(\&wanted, "$defdir/$MACH") if (scalar(@ARGV) == 0); find(\&wanted, "$defdir/$PLATFORM") if (scalar(@ARGV) == 0); + die $USAGE if (scalar(@files) == 0); $dtrace_path = '/usr/sbin/dtrace'; @@ -562,7 +591,7 @@ push(@dtrace_cmds, $jdtrace_path) if ($opt_j); push(@dtrace_cmds, "/usr/sbin/$opt_i/dtrace") if ($opt_i); } else { - @dtrace_cmds = ($dtrace_path, $jdtrace_path); + @dtrace_cmds = ($dtrace_path); } if ($opt_d) { @@ -589,12 +618,6 @@ $ENV{'LD_PRELOAD'} = 'libumem.so'; } -# -# Ensure that $PATH contains a cc(1) so that we can execute the -# test programs that require compilation of C code. -# -$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; - if ($opt_b) { logmsg("badioctl'ing ... ");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/cmd/dtrace/test/cmd/scripts/dtfailures.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -0,0 +1,42 @@ +#!/usr/bin/ksh -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +let failure=0 + +printf "%-3s %-10s %-31s %s\n" "#" "KIND" "TEST" "DETAILS" + +while [[ -d failure.$failure ]]; do + dir=failure.$failure + tst=`cat $dir/README | head -1 | nawk '{ print $2 }'` + kind=`basename $(dirname $tst)` + name=`basename $tst` + cols=$(expr `tput cols` - 47) + details=`tail -1 $dir/*.err | cut -c1-$cols` + printf "%-3d %-10s %-31s " $failure $kind $name + echo $details + let failure=failure+1 +done +
--- a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl Thu Jun 30 22:33:31 2011 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/perl5/bin/perl -w # # CDDL HEADER START # @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # # get.ipv4remote.pl [tcpport]
--- a/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl Thu Jun 30 22:33:31 2011 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/perl5/bin/perl -w # # CDDL HEADER START # @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # # get.ipv6remote.pl
--- a/usr/src/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -75,7 +75,7 @@ close \$s; EOPERL -$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE +$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE BEGIN { ipsend = tcpsend = ipreceive = tcpreceive = 0;
--- a/usr/src/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -78,7 +78,7 @@ close \$s; EOPERL -$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE +$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE BEGIN { ipsend = tcpsend = ipreceive = tcpreceive = 0;
--- a/usr/src/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -81,7 +81,7 @@ close \$s; EOPERL -$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE +$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE BEGIN { ipsend = tcpsend = ipreceive = tcpreceive = 0;
--- a/usr/src/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -86,7 +86,7 @@ close \$s; EOPERL -$dtrace -c '/usr/bin/perl test.pl' -qs /dev/stdin <<EODTRACE +$dtrace -c 'perl test.pl' -qs /dev/stdin <<EODTRACE BEGIN { ipsend = tcpsend = ipreceive = tcpreceive = 0;
--- a/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -30,7 +30,7 @@ fi dtrace=$1 -CC=/usr/sfw/bin/gcc +CC=`which gcc` CFLAGS= doit() @@ -86,10 +86,33 @@ # becomes a problem, kindly fix it by reducing the number of bad files! (That # is, fix it by fixing the broken file, not the broken script.) # -badfiles="ctype.h ser_sync.h neti.h hook_event.h \ - bootconf.h bootstat.h dtrace.h dumphdr.h exacct_impl.h fasttrap.h \ - kobj.h kobj_impl.h ksyms.h lockstat.h smedia.h stat.h utsname.h \ - rds.h smbios_impl.h" +badfiles="\ + bootconf.h \ + bootstat.h \ + ctype.h \ + dtrace.h \ + dumphdr.h \ + exacct_impl.h \ + fasttrap.h \ + hook_event.h \ + iscsi_authclient.h \ + kiconv_ja.h \ + kiconv_ja_jis_to_unicode.h \ + kiconv_ja_unicode_to_jis.h \ + kobj.h \ + kobj_impl.h \ + ksyms.h \ + lockstat.h \ + neti.h \ + rds.h \ + ser_sync.h \ + smbios_impl.h \ + smedia.h \ + sockfilter.h \ + stat.h \ + u8_textprep_data.h \ + utsname.h \ + vnic.h" for inc in $files; do file=`basename $inc`
--- a/usr/src/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -33,13 +32,12 @@ dtrace=$1 # -# /usr/ccs/bin/nm execs a 64-bit version of itself. DTrace uses libproc -# (which uses /proc) to find out when the traced process exits, but a -# 32-bit process can't examine a 64-bit one with libproc. The -# LD_NOEXEC_64 variable prevents nm from re-execing itself. +# Some variants of nm may exec a 64-bit version of themselves. DTrace uses +# libproc (which uses /proc) to find out when the traced process exits, but a +# 32-bit process can't examine a 64-bit one with libproc. The LD_NOEXEC_64 +# variable prevents nm from re-execing itself. # -LD_NOEXEC_64=tomeeisrad $dtrace -F -s /dev/stdin -c \ - '/usr/ccs/bin/nm /bin/ls' stat <<EOF +LD_NOEXEC_64=nono $dtrace -F -s /dev/stdin -c 'nm /bin/ls' stat <<EOF pid\$target::\$1:entry {
--- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that specifying a glob in a pid provider name @@ -46,10 +45,10 @@ all: main main: main.o - cc -o main main.o + gcc -o main main.o main.o: main.c - cc -c main.c + gcc -c main.c EOF cat > main.c <<EOF
--- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that probes will be picked up after a dlopen(3C) @@ -46,16 +45,16 @@ all: main altlib.so main: main.o - cc -o main main.o + gcc -o main main.o main.o: main.c - cc -c main.c + gcc -c main.c altlib.so: altlib.o - cc -z defs -G -o altlib.so altlib.o -lc + gcc -shared -o altlib.so altlib.o -lc altlib.o: altlib.c - cc -c altlib.c + gcc -c altlib.c EOF cat > altlib.c <<EOF
--- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that a regex in the provider name will match @@ -44,13 +43,13 @@ cd $DIR cat > Makefile <<EOF - all: main +all: main main: main.o prov.o - cc -o main main.o prov.o + gcc -o main main.o prov.o main.o: main.c prov.h - cc -c main.c + gcc -c main.c prov.h: prov.d $dtrace -h -s prov.d
--- a/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that USDT probes will be picked up after a dlopen(3C) @@ -47,10 +46,10 @@ all: main altlib.so main: main.o provmain.o - cc -o main main.o provmain.o + gcc -o main main.o provmain.o main.o: main.c prov.h - cc -c main.c + gcc -c main.c prov.h: prov.d $dtrace -h -s prov.d @@ -59,10 +58,10 @@ $dtrace -G -32 -o provmain.o -s prov.d main.o altlib.so: altlib.o provalt.o - cc -z defs -G -o altlib.so altlib.o provalt.o -lc + gcc -shared -o altlib.so altlib.o provalt.o -lc altlib.o: altlib.c prov.h - cc -c altlib.c + gcc -c altlib.c provalt.o: prov.d altlib.o $dtrace -G -32 -o provalt.o -s prov.d altlib.o
--- a/usr/src/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -50,7 +50,7 @@ } EOF -cc -o test test.c +gcc -o test test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -61,7 +61,7 @@ # # The only thing we can be sure of here is that ksh is doing some work. # -script | tee /dev/fd/2 | egrep -w '(ksh|libshell)' > /dev/null +script | tee /dev/fd/2 | egrep '(ksh|libshell)' > /dev/null status=$? kill $child
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -61,12 +60,12 @@ } EOF -cc -xarch=generic64 -c -o test64.o test.c +gcc -m64 -c -o test64.o test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c 64-bit" exit 1 fi -cc -xarch=generic -c -o test32.o test.c +gcc -m32 -c -o test32.o test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c 32-bit" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -60,10 +60,10 @@ all: main main: main.o prov.o - \$(CC) -o main main.o prov.o + gcc -o main main.o prov.o main.o: main.c prov.h - \$(CC) -c main.c + gcc -c main.c prov.h: prov.d $dtrace -h -s prov.d
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that USDT providers are removed when its associated @@ -46,17 +45,17 @@ all: main livelib.so deadlib.so main: main.o prov.o - cc -o main main.o + gcc -o main main.o main.o: main.c - cc -c main.c + gcc -c main.c livelib.so: livelib.o prov.o - cc -z defs -G -o livelib.so livelib.o prov.o -lc + gcc -shared -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h - cc -c livelib.c + gcc -c livelib.c prov.o: livelib.o prov.d $dtrace -G -s prov.d livelib.o @@ -66,10 +65,10 @@ deadlib.so: deadlib.o - cc -z defs -G -o deadlib.so deadlib.o -lc + gcc -shared -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c - cc -c deadlib.c + gcc -c deadlib.c clean: rm -f main.o livelib.o prov.o prov.h deadlib.o @@ -125,7 +124,7 @@ } EOF -/usr/ccs/bin/make > /dev/null +make > /dev/null if [ $? -ne 0 ]; then print -u2 "failed to build" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -41,17 +40,17 @@ all: main livelib.so deadlib.so main: main.o prov.o - cc -o main main.o + gcc -o main main.o main.o: main.c - cc -c main.c + gcc -c main.c livelib.so: livelib.o prov.o - cc -z defs -G -o livelib.so livelib.o prov.o -lc + gcc -shared -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h - cc -c livelib.c + gcc -c livelib.c prov.o: livelib.o prov.d $dtrace -G -s prov.d livelib.o @@ -61,10 +60,10 @@ deadlib.so: deadlib.o - cc -z defs -G -o deadlib.so deadlib.o -lc + gcc -shared -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c - cc -c deadlib.c + gcc -c deadlib.c clean: rm -f main.o livelib.o prov.o prov.h deadlib.o @@ -136,7 +135,7 @@ } EOF -/usr/ccs/bin/make > /dev/null +make > /dev/null if [ $? -ne 0 ]; then print -u2 "failed to build" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This test verifies that performing a dlclose(3dl) on a library doesn't @@ -46,17 +45,17 @@ all: main livelib.so deadlib.so main: main.o prov.o - cc -o main main.o + gcc -o main main.o main.o: main.c - cc -c main.c + gcc -c main.c livelib.so: livelib.o prov.o - cc -z defs -G -o livelib.so livelib.o prov.o -lc + gcc -shared -o livelib.so livelib.o prov.o -lc livelib.o: livelib.c prov.h - cc -c livelib.c + gcc -c livelib.c prov.o: livelib.o prov.d $dtrace -G -s prov.d livelib.o @@ -66,10 +65,10 @@ deadlib.so: deadlib.o - cc -z defs -G -o deadlib.so deadlib.o -lc + gcc -shared -o deadlib.so deadlib.o -lc deadlib.o: deadlib.c - cc -c deadlib.c + gcc -c deadlib.c clean: rm -f main.o livelib.o prov.o prov.h deadlib.o @@ -131,7 +130,7 @@ } EOF -/usr/ccs/bin/make > /dev/null +make > /dev/null if [ $? -ne 0 ]; then print -u2 "failed to build" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # Make sure temporary symbols generated due to DTrace probes in static @@ -72,7 +71,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -82,7 +81,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -61,7 +60,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -71,7 +70,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # # This test is primarily intended to verify a fix for SPARC, but there's no @@ -77,7 +76,7 @@ } EOF -cc -c -xO2 test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -87,7 +86,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -70,7 +69,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -80,7 +79,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -71,7 +70,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -81,7 +80,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -61,7 +60,7 @@ } EOF -cc -xarch=generic -c test.c +gcc -m32 -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -71,7 +70,7 @@ print -u2 "failed to create DOF" exit 1 fi -cc -xarch=generic -o test test.o prov.o +gcc -m32 -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -61,7 +60,7 @@ } EOF -cc -xarch=generic64 -c test.c +gcc -m64 -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -71,7 +70,7 @@ print -u2 "failed to create DOF" exit 1 fi -cc -xarch=generic64 -o test test.o prov.o +gcc -m64 -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -65,7 +64,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -75,7 +74,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Make sure <unistd.h> defines _DTRACE_VERSION @@ -46,7 +45,7 @@ } EOF -cc -xarch=generic -o test test.c +gcc -m32 -o test test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -62,7 +61,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -72,7 +71,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -64,7 +63,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -74,7 +73,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -65,7 +64,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -75,7 +74,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Fake up a scenario where _DTRACE_VERSION is not defined by having our own # <unistd.h>. This tests that dtrace -h will produce a header file which can @@ -70,12 +69,12 @@ } EOF -cc -I. -xarch=generic -c test.c +gcc -I. -m32 -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -cc -xarch=generic -o test test.o +gcc -m32 -o test test.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -51,7 +51,7 @@ }; 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 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -51,7 +51,7 @@ }; 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 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -62,7 +61,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -72,7 +71,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -51,7 +51,7 @@ }; 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 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -52,7 +51,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -62,7 +61,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -63,7 +62,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -73,7 +72,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # Rebuilding an object file containing DOF changes slightly when the object # files containing the probes have already been modified. This tests that @@ -67,7 +66,7 @@ }; EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -83,7 +82,7 @@ print -u2 "failed to create final 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
--- a/usr/src/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -24,7 +24,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" if [ $# != 1 ]; then echo expected one argument: '<'dtrace-path'>' @@ -62,7 +61,7 @@ } EOF -cc -c test.c +gcc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -72,7 +71,7 @@ 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
--- a/usr/src/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh Thu Jun 30 22:33:31 2011 -0700 @@ -23,7 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # ASSERTION: Make sure USDT probes work as tail-calls on SPARC. @@ -88,7 +87,7 @@ 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
--- a/usr/src/pkg/manifests/system-dtrace-tests.mf Thu Sep 15 18:27:52 2011 +0100 +++ b/usr/src/pkg/manifests/system-dtrace-tests.mf Thu Jun 30 22:33:31 2011 -0700 @@ -128,6 +128,7 @@ file path=opt/SUNWdtrt/bin/chkargs mode=0555 file path=opt/SUNWdtrt/bin/dstyle mode=0555 file path=opt/SUNWdtrt/bin/dtest mode=0555 +file path=opt/SUNWdtrt/bin/dtfailures mode=0555 file path=opt/SUNWdtrt/bin/exception.lst mode=0444 file path=opt/SUNWdtrt/bin/jdtrace mode=0555 file path=opt/SUNWdtrt/lib/java/jdtrace.jar