From 4257781cdca17c8173bb7206df98ccadcda6d5cf Mon Sep 17 00:00:00 2001 From: John Birrell Date: Sat, 26 Apr 2008 03:36:28 +0000 Subject: [PATCH] * Set the path to perl on FreeBSD. * Use the FreeBSD shell. * On FreeBSD the tests run from the OBJDIR, so output files go there rather than in the source tree like they do on Solaris. * FreeBSD doesn't need a special path to the compiler. --- .../opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 96244107532d..e8d9032fcd6c 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl @@ -1,4 +1,4 @@ -#!/usr/perl5/bin/perl +#!/usr/local/bin/perl # # CDDL HEADER START # @@ -43,7 +43,7 @@ $USAGE = "Usage: $PNAME [-abfghjlnqs] [-d dir] [-i isa] " @dtrace_argv = (); -$ksh_path = '/usr/bin/ksh'; +$ksh_path = '/bin/sh'; @files = (); %exceptions = (); @@ -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 || @@ -592,7 +592,7 @@ if ($opt_g) { # 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'; +#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; if ($opt_b) { logmsg("badioctl'ing ... ");