stas 2004/09/04 17:11:30
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestMB.pm TestMM.pm
TestReport.pm TestRun.pm TestSmoke.pm
Log:
fix 'require blib' in scripts to also call 'blib->import', required to
have an effect under perl 5.6.x.
Revision Changes Path
1.162 +3 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -u -r1.161 -r1.162
--- Changes 27 Aug 2004 00:51:55 -0000 1.161
+++ Changes 5 Sep 2004 00:11:30 -0000 1.162
@@ -8,6 +8,9 @@
=item 1.14-dev
+fix 'require blib' in scripts to also call 'blib->import', required to
+have an effect under perl 5.6.x. [Stas]
+
Make sure that when Apache-Test is a part of modperl-2.0 checkout, the
interactive configuration is properly run (it must not be run when
mod_perl 2.0 is tested since it should have all the info needed to run
1.7 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestMB.pm
Index: TestMB.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMB.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- TestMB.pm 7 Aug 2004 02:56:26 -0000 1.6
+++ TestMB.pm 5 Sep 2004 00:11:30 -0000 1.7
@@ -109,7 +109,7 @@
unlink $script if -e $script;
# Start the contents of t/TEST.
- my $body = "BEGIN { eval { require blib; } }\n"
+ my $body = "BEGIN { eval { require blib && blib->import; } }\n"
. Apache::TestConfig->modperl_2_inc_fixup;
# Configure the arguments for t/TEST.
1.37 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm
Index: TestMM.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -u -r1.36 -r1.37
--- TestMM.pm 7 Aug 2004 02:56:26 -0000 1.36
+++ TestMM.pm 5 Sep 2004 00:11:30 -0000 1.37
@@ -86,7 +86,7 @@
unlink $file if -e $file;
- my $body = "BEGIN { eval { require blib; } }\n";
+ my $body = "BEGIN { eval { require blib && blib->import; } }\n";
$body .= Apache::TestConfig->modperl_2_inc_fixup;
1.14 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestReport.pm
Index: TestReport.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestReport.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- TestReport.pm 7 Aug 2004 02:56:26 -0000 1.13
+++ TestReport.pm 5 Sep 2004 00:11:30 -0000 1.14
@@ -35,7 +35,7 @@
$file ||= catfile 't', 'REPORT';
my $content = join "\n",
- "BEGIN { eval { require blib; } }",
+ "BEGIN { eval { require blib && blib->import; } }",
Apache::TestConfig->modperl_2_inc_fixup,
Apache::TestConfig->perlscript_header,
"use $class;",
1.182 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -u -r1.181 -r1.182
--- TestRun.pm 28 Aug 2004 15:05:32 -0000 1.181
+++ TestRun.pm 5 Sep 2004 00:11:30 -0000 1.182
@@ -1229,7 +1229,7 @@
$opts{file} ||= catfile 't', 'TEST';
}
- my $body = "BEGIN { eval { require blib; } }\n";
+ my $body = "BEGIN { eval { require blib && blib->import; } }\n";
$body .= Apache::TestConfig->modperl_2_inc_fixup;
1.31 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmoke.pm
Index: TestSmoke.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmoke.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -u -r1.30 -r1.31
--- TestSmoke.pm 7 Aug 2004 02:56:26 -0000 1.30
+++ TestSmoke.pm 5 Sep 2004 00:11:30 -0000 1.31
@@ -753,7 +753,7 @@
$file ||= catfile 't', 'SMOKE';
my $content = join "\n",
- "BEGIN { eval { require blib; } }",
+ "BEGIN { eval { require blib && blib->import; } }",
Apache::TestConfig->modperl_2_inc_fixup,
Apache::TestConfig->perlscript_header,
"use $class;",
