Change 34540 by [EMAIL PROTECTED] on 2008/10/20 20:08:43
Integrate:
[ 34534]
Integrate:
[ 34434]
Subject: [PATCH] Loading modules in test.pl
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Tue, 23 Sep 2008 09:40:27 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34528]
Change "use $foo; 1" in evals to "require $foo; 1" to avoid breaking
even more tests if use is borked, but not require.
Affected files ...
... //depot/maint-5.8/perl/t/test.pl#26 integrate
Differences ...
==== //depot/maint-5.8/perl/t/test.pl#26 (text) ====
Index: perl/t/test.pl
--- perl/t/test.pl#25~34344~ 2008-09-11 07:36:19.000000000 -0700
+++ perl/t/test.pl 2008-10-20 13:08:43.000000000 -0700
@@ -527,12 +527,11 @@
# run a fresh perl, so we'll brute force launder everything for you
my $sep;
- eval "require Config; Config->import";
- if ($@) {
+ if (! eval 'require Config; 1') {
warn "test.pl had problems loading Config: $@";
$sep = ':';
} else {
- $sep = $Config{path_sep};
+ $sep = $Config::Config{path_sep};
}
my @keys = grep {exists $ENV{$_}} qw(CDPATH IFS ENV BASH_ENV);
@@ -573,12 +572,11 @@
return $Perl if $^O eq 'VMS';
my $exe;
- eval "require Config; Config->import";
- if ($@) {
+ if (! eval 'require Config; 1') {
warn "test.pl had problems loading Config: $@";
$exe = '';
} else {
- $exe = $Config{_exe};
+ $exe = $Config::Config{_exe};
}
$exe = '' unless defined $exe;
@@ -588,8 +586,7 @@
if ($Perl =~ /^perl\Q$exe\E$/i) {
my $perl = "perl$exe";
- eval "require File::Spec";
- if ($@) {
+ if (! eval 'require File::Spec; 1') {
warn "test.pl had problems loading File::Spec: $@";
$Perl = "./$perl";
} else {
@@ -903,7 +900,7 @@
# Use a watchdog thread because either 'threads' is loaded,
# or fork() failed
- if (eval { require threads; }) {
+ if (eval 'require threads; 1') {
threads->create(sub {
# Load POSIX if available
eval { require POSIX; };
End of Patch.
