which_perl for safer $^Xing

[p5sagit/p5-mst-13.2.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index cf5f021..481cc79 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -163,19 +163,15 @@ EOT
 
        $test = $OVER{$test} if exists $OVER{$test};
 
-       open(SCRIPT,"<$test") or die "Can't run $test.\n";
-       $_ = <SCRIPT>;
-       close(SCRIPT) unless ($type eq 'deparse');
-       if (/#!.*perl(.*)$/) {
-           $switch = $1;
-           if ($^O eq 'VMS') {
-               # Must protect uppercase switches with "" on command line
-               $switch =~ s/-([A-Z]\S*)/"-$1"/g;
-           }
-       }
-       else {
-           $switch = '';
-       }
+       open(SCRIPT,"<$test") or die "Can't run $test.\n";
+       $_ = <SCRIPT>;
+       close(SCRIPT) unless ($type eq 'deparse');
+       if (/#!.*\bperl.*-\w*T/) {
+           $switch = '"-T"';
+       }
+       else {
+           $switch = '';
+       }
 
        my $file_opts = "";
        if ($type eq 'deparse') {
@@ -305,28 +301,40 @@ EOT
        else {
            warn "Failed $bad test scripts out of $files, $pct% okay.\n";
        }
-       warn <<'SHRDLU';
+       warn <<'SHRDLU_1';
    ### Since not all tests were successful, you may want to run some of
    ### them individually and examine any diagnostic messages they produce.
    ### See the INSTALL document's section on "make test".
-SHRDLU
-       warn <<'SHRDLU' if $good / $total > 0.8;
+SHRDLU_1
+       warn <<'SHRDLU_2' if $good / $total > 0.8;
    ### You have a good chance to get more information by running
    ###     ./perl harness
    ### in the 't' directory since most (>=80%) of the tests succeeded.
-SHRDLU
-       use Config;
-       if ($Config{ldlibpthname}) {
-           warn <<SHRDLU;
+SHRDLU_2
+        if (eval {require Config; import Config; 1}) {
+           if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
+               warn <<SHRDLU_3;
    ### You may have to set your dynamic library search path,
-   ### $Config{ldlibpthname}, to point to the build directory
-   ### before running the harness-- depending on your shell style:
-   ###     setenv $Config{ldlibpthname} `pwd`:\${?$Config{ldlibpthname}}; cd t; ./perl harness
-   ###     $Config{ldlibpthname}=`pwd`:\$$Config{ldlibpthname}; export $Config{ldlibpthname}; cd t; ./perl harness
-   ###     export $Config{ldlibpthname}=`pwd`:\$$Config{ldlibpthname}; cd t; ./perl harness
+   ### $p, to point to the build directory:
+SHRDLU_3
+                if (exists $ENV{$p} && $ENV{$p} ne '') {
+                   warn <<SHRDLU_4a;
+   ###     setenv $p `pwd`:\$$p; cd t; ./perl harness
+   ###     $p=`pwd`:\$$p; export $p; cd t; ./perl harness
+   ###     export $p=`pwd`:\$$p; cd t; ./perl harness
+SHRDLU_4a
+                } else {
+                   warn <<SHRDLU_4b;
+   ###     setenv $p `pwd`; cd t; ./perl harness
+   ###     $p=`pwd`; export $p; cd t; ./perl harness
+   ###     export $p=`pwd`; cd t; ./perl harness
+SHRDLU_4b
+                }    
+               warn <<SHRDLU_5;
    ### for csh-style shells, like tcsh; or for traditional/modern
    ### Bourne-style shells, like bash, ksh, and zsh, respectively.
-SHRDLU
+SHRDLU_5
+            }
        }
     }
     ($user,$sys,$cuser,$csys) = times;