stas 2003/05/13 19:53:54
Modified: perl-framework/Apache-Test/lib/Apache TestMM.pm
TestReport.pm TestRun.pm TestSmoke.pm
perl-framework/Apache-Test Changes
Log:
wrap blib loading in eval block (added to autogenerated files), to
prevent 'make clean' failures.
Revision Changes Path
1.26 +2 -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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TestMM.pm 1 May 2003 06:22:35 -0000 1.25
+++ TestMM.pm 14 May 2003 02:53:54 -0000 1.26
@@ -4,6 +4,7 @@
use warnings FATAL => 'all';
use Config;
+use Apache::TestLoad ();
use Apache::TestConfig ();
use Apache::TestTrace;
@@ -72,7 +73,7 @@
unlink $file if -e $file;
- my $body = "use blib;\n";
+ my $body = "BEGIN { eval { require blib; } }\n";
$body .= Apache::TestConfig->modperl_2_inc_fixup;
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestReport.pm 1 May 2003 06:22:35 -0000 1.8
+++ TestReport.pm 14 May 2003 02:53:54 -0000 1.9
@@ -21,7 +21,7 @@
$file ||= catfile 't', 'REPORT';
my $content = join "\n",
- "use blib;",
+ "BEGIN { eval { require blib; } }",
Apache::TestConfig->modperl_2_inc_fixup,
Apache::TestConfig->perlscript_header,
"use $class;",
1.110 +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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- TestRun.pm 14 May 2003 01:12:21 -0000 1.109
+++ TestRun.pm 14 May 2003 02:53:54 -0000 1.110
@@ -841,7 +841,7 @@
$file ||= catfile 't', 'TEST';
- my $body = "use blib;\n";
+ my $body = "BEGIN { eval { require blib; } }\n";
$body .= Apache::TestConfig->modperl_2_inc_fixup;
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestSmoke.pm 1 May 2003 06:22:35 -0000 1.19
+++ TestSmoke.pm 14 May 2003 02:53:54 -0000 1.20
@@ -461,7 +461,7 @@
$file ||= catfile 't', 'SMOKE';
my $content = join "\n",
- "use blib;",
+ "BEGIN { eval { require blib; } }",
Apache::TestConfig->modperl_2_inc_fixup,
Apache::TestConfig->perlscript_header,
"use $class;",
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Changes 14 May 2003 02:03:40 -0000 1.19
+++ Changes 14 May 2003 02:53:54 -0000 1.20
@@ -8,6 +8,9 @@
=item 1.03-dev -
+wrap blib loading in eval block (added to autogenerated files), to
+prevent 'make clean' failures. [Stas]
+
add two more variants of each of the tracing functions. If the '_mark'
suffix is appended (e.g., 'error_mark') the trace will start with the
filename and the line number the function was called from. If the
