Test For Echo, take 2

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

diff --git a/t/TEST b/t/TEST
index d558749..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') {
@@ -316,7 +312,7 @@ SHRDLU_1
    ### in the 't' directory since most (>=80%) of the tests succeeded.
 SHRDLU_2
         if (eval {require Config; import Config; 1}) {
-           if (my $p = $Config{ldlibpthname}) {
+           if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
                warn <<SHRDLU_3;
    ### You may have to set your dynamic library search path,
    ### $p, to point to the build directory: