You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2002/05/15 00:48:34 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRunPerl.pm TestRun.pm
dougm 02/05/14 15:48:34
Modified: perl-framework/Apache-Test/lib/Apache TestRunPerl.pm
TestRun.pm
Log:
tweak Apache::TestRun::generate_script so Apache::TestRunPerl (and
other subclasses) can inherit it, rather than duplicating everywhere.
Revision Changes Path
1.7 +0 -24 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
Index: TestRunPerl.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestRunPerl.pm 14 May 2002 21:53:51 -0000 1.6
+++ TestRunPerl.pm 14 May 2002 22:48:34 -0000 1.7
@@ -39,28 +39,4 @@
$self->configure_modperl;
}
-# generate t/TEST script (or a different filename) which will drive
-# Apache::TestRunPerl
-sub generate_script {
- my ($class, $file) = @_;
-
- $file ||= catfile 't', 'TEST';
-
- my $content = <<'EOM';
-use strict;
-use warnings FATAL => 'all';
-
-use FindBin;
-use lib "$FindBin::Bin/../Apache-Test/lib";
-
-use Apache::TestRunPerl ();
-
-Apache::TestRunPerl->new->run(@ARGV);
-EOM
-
- Apache::Test::config()->write_perlscript($file, $content);
-
-}
-
-
1;
1.90 +5 -4 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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- TestRun.pm 14 May 2002 21:53:51 -0000 1.89
+++ TestRun.pm 14 May 2002 22:48:34 -0000 1.90
@@ -778,16 +778,17 @@
$content = "\%Apache::TestConfig::Argv = qw(@Apache::TestMM::Argv);\n";
}
- $content .= <<'EOM';
+ $content .= <<EOM;
use strict;
use warnings FATAL => 'all';
use FindBin;
-use lib "$FindBin::Bin/../Apache-Test/lib";
+use lib "\$FindBin::Bin/../Apache-Test/lib";
+use lib 'lib';
-use Apache::TestRun ();
+use $class ();
-Apache::TestRun->new->run(@ARGV);
+$class->new->run(\@ARGV);
EOM
Apache::Test::config()->write_perlscript($file, $content);