diff options
| author | John E. Malmberg <wb8tyw@qsl.net> | 2007-11-11 11:42:46 -0600 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2007-11-12 05:00:47 +0000 |
| commit | 234fd682f8f9bd4358b24b5052732af3a76654c2 (patch) | |
| tree | a7185283d6d76f86de3490c3f4afc3a72f325c5f /lib/File | |
| parent | ff504b36b0f6467f64b463fd17fb34f640855abc (diff) | |
| download | perl-234fd682f8f9bd4358b24b5052732af3a76654c2.tar.gz | |
patch@32274 file/find/t/ find.t and taint.t fixes for VMS.
From: "John E. Malmberg" <wb8tyw@qsl.net>
Message-id: <47379376.6070809@qsl.net>
With variations to make it cross-platform.
p4raw-id: //depot/perl@32279
Diffstat (limited to 'lib/File')
| -rw-r--r-- | lib/File/Find/t/find.t | 4 | ||||
| -rw-r--r-- | lib/File/Find/t/taint.t | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/File/Find/t/find.t b/lib/File/Find/t/find.t index 33e5264098..60834bd977 100644 --- a/lib/File/Find/t/find.t +++ b/lib/File/Find/t/find.t @@ -10,8 +10,10 @@ my ($warn_msg, @files, $file); BEGIN { + require File::Spec; chdir 't' if -d 't'; - unshift @INC => '../lib'; + # May be doing dynamic loading while @INC is all relative + unshift @INC => File::Spec->rel2abs('../lib'); $SIG{'__WARN__'} = sub { $warn_msg = $_[0]; warn "# $_[0]"; } } diff --git a/lib/File/Find/t/taint.t b/lib/File/Find/t/taint.t index 1d6fb004f7..2059765838 100644 --- a/lib/File/Find/t/taint.t +++ b/lib/File/Find/t/taint.t @@ -8,8 +8,12 @@ my ($cwd, $cwd_untainted); BEGIN { + require File::Spec; chdir 't' if -d 't'; - unshift @INC => '../lib'; + # May be doing dynamic loading while @INC is all relative + my $lib = File::Spec->rel2abs('../lib'); + $lib = $1 if $lib =~ m/(.*)/; + unshift @INC => $lib; } use Config; |