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:49:38 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestSmokePerl.pm TestSmoke.pm
dougm 02/05/14 15:49:38
Modified: perl-framework/Apache-Test/lib/Apache TestSmokePerl.pm
TestSmoke.pm
Log:
tweak Apache::TestSmoke::generate_script so Apache::TestSmokePerl (and
other subclasses) can inherit it, rather than duplicating everywhere.
Revision Changes Path
1.3 +0 -24 httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmokePerl.pm
Index: TestSmokePerl.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmokePerl.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSmokePerl.pm 31 Dec 2001 08:39:48 -0000 1.2
+++ TestSmokePerl.pm 14 May 2002 22:49:38 -0000 1.3
@@ -13,30 +13,6 @@
use vars qw(@ISA);
@ISA = qw(Apache::TestSmoke);
-# generate t/SMOKE script (or a different filename) which will drive
-# Apache::TestSmokePerl
-sub generate_script {
- my ($class, $file) = @_;
-
- $file ||= catfile 't', 'SMOKE';
-
- my $content = <<'EOM';
-use strict;
-use warnings FATAL => 'all';
-
-use FindBin;
-use lib "$FindBin::Bin/../Apache-Test/lib";
-use lib "$FindBin::Bin/../lib";
-
-use Apache::TestSmokePerl ();
-
-Apache::TestSmokePerl->new(@ARGV)->run;
-EOM
-
- Apache::Test::config()->write_perlscript($file, $content);
-
-}
-
sub build_config_as_string {
my($self) = @_;
1.14 +7 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestSmoke.pm 10 May 2002 16:48:28 -0000 1.13
+++ TestSmoke.pm 14 May 2002 22:49:38 -0000 1.14
@@ -452,7 +452,7 @@
}
print <<EOM;
- if 'tests' argument isn't provided all available tests will be run
+ if 'tests' argument is not provided all available tests will be run
EOM
}
@@ -463,17 +463,18 @@
$file ||= catfile 't', 'SMOKE';
- my $content = <<'EOM';
+ my $content = <<EOM;
use strict;
use warnings FATAL => 'all';
use FindBin;
-use lib "$FindBin::Bin/../Apache-Test/lib";
-use lib "$FindBin::Bin/../lib";
+use lib "\$FindBin::Bin/../Apache-Test/lib";
+use lib "\$FindBin::Bin/../lib";
+use lib 'lib';
-use Apache::TestSmoke ();
+use $class ();
-Apache::TestSmoke->new(@ARGV)->run;
+$class->new(\@ARGV)->run;
EOM
Apache::Test::config()->write_perlscript($file, $content);