svn commit: r125077 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas
Date: Thu Jan 13 06:19:22 2005
New Revision: 125077
URL: http://svn.apache.org/viewcvs?view=revrev=125077
Log:
extend Apache::TestConfig::which() to search under perl's bin
directory (in the case of local perl install many utils get installed
there, but won't be in PATH).
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=125077p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=125076p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=125077
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Thu Jan 13 06:19:22 2005
@@ -8,6 +8,10 @@
=item 1.20-dev
+extend Apache::TestConfig::which() to search under perl's bin
+directory (in the case of local perl install many utils get installed
+there, but won't be in PATH). [Stas]
+
Apache::TestConfig::inherit_load_module handles .dll modules
(previously was only .so) [Stas]
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=125077p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=125076p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=125077
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Thu Jan 13 06:19:22 2005
@@ -1643,7 +1643,13 @@
return undef unless $program;
-for my $base (map { catfile($_, $program) } File::Spec-path()) {
+my @dirs = File::Spec-path();
+
+require Config;
+my $perl_bin = $Config::Config{bin} || '';
+push @dirs, $perl_bin if $perl_bin and -d $perl_bin;
+
+for my $base (map { catfile $_, $program } @dirs) {
if ($ENV{HOME} and not WIN32) {
# only works on Unix, but that's normal:
# on Win32 the shell doesn't have special treatment of '~'
svn commit: r125097 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Author: stas
Date: Thu Jan 13 12:10:53 2005
New Revision: 125097
URL: http://svn.apache.org/viewcvs?view=revrev=125097
Log:
instead of trying to match various custom server name variations (each
vendor seems to replace Apache in 'httpd -v' with their own name),
just try to match the /x.y in Foo-Apache-Bar/x.y.z to figure out
the server generation (rev).
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=125097p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=125096p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=125097
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Thu Jan 13 12:10:53 2005
@@ -8,6 +8,11 @@
=item 1.20-dev
+instead of trying to match various custom server name variations (each
+vendor seems to replace Apache in 'httpd -v' with their own name),
+just try to match the /x.y in Foo-Apache-Bar/x.y.z to figure out
+the server generation (rev). [Stas]
+
extend Apache::TestConfig::which() to search under perl's bin
directory (in the case of local perl install many utils get installed
there, but won't be in PATH). [Stas]
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm?view=diffrev=125097p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pmr1=125096p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pmr2=125097
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Thu Jan 13 12:10:53 2005
@@ -67,14 +67,8 @@
# string and various variations made by distributions which mangle
# that string
-# Apache/2.0.50-dev
-($self-{rev}) = $self-{version} =~ m|^Apache/(\d)\.|;
-
-# Apache-AdvancedExtranetServer/1.3.29 (Mandrake Linux/1mdk)
-($self-{rev}) ||= $self-{version} =~ m|^Apache.*?/(\d)\.|;
-
-# IBM_HTTP_SERVER/1.3.19 Apache/1.3.20 (Unix)
-($self-{rev}) ||= $self-{version} =~ m|^.*?Apache.*?/(\d)\.|;
+# Foo-Apache-Bar/x.y.z
+($self-{rev}) = $self-{version} =~ m|/(\d)\.|;
if ($self-{rev}) {
debug Matched Apache revision $self-{version} $self-{rev};
svn commit: r124809 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Author: stas
Date: Mon Jan 10 08:24:21 2005
New Revision: 124809
URL: http://svn.apache.org/viewcvs?view=revrev=124809
Log:
Apache::TestConfig::should_skip_module now works with regex
patterns.
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=124809p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=124808p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=124809
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Mon Jan 10 08:24:21 2005
@@ -8,6 +8,11 @@
=item 1.20-dev
+Apache::TestConfig::should_skip_module now works with regex
+patterns. [Stas]
+
+
+
=item 1.19 - January 5, 2005
Test for module.c instead of module.so for IfModule in
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm?view=diffrev=124809p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pmr1=124808p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pmr2=124809
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Mon Jan 10 08:24:21 2005
@@ -162,20 +162,28 @@
#XXX mod_jk requires JkWorkerFile or JkWorker to be configured
#skip it for now, tomcat has its own test suite anyhow.
#XXX: mod_casp2.so requires other settings in addition to LoadModule
-my %autoconfig_skip_module = map { $_, 1 } qw(mod_jk.c mod_casp2.c);
+my @autoconfig_skip_module = qw(mod_jk.c mod_casp2.c);
# add modules to be not inherited from the existing config.
# e.g. prevent from LoadModule perl_module to be included twice, when
# mod_perl already configures LoadModule and it's certainly found in
# the existing httpd.conf installed system-wide.
sub autoconfig_skip_module_add {
-my($name) = @_;
-$autoconfig_skip_module{$name} = 1;
+push @autoconfig_skip_module, @_;
}
sub should_skip_module {
my($self, $name) = @_;
-return $autoconfig_skip_module{$name} ? 1 : 0;
+
+for (@autoconfig_skip_module) {
+if (UNIVERSAL::isa($_, 'Regexp')) {
+return 1 if $name =~ /$_/;
+}
+else {
+return 1 if $name eq $_;
+}
+}
+return 0;
}
#inherit LoadModule
svn commit: r124810 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Author: stas
Date: Mon Jan 10 08:25:21 2005
New Revision: 124810
URL: http://svn.apache.org/viewcvs?view=revrev=124810
Log:
Apache::TestConfig::inherit_load_module handles .dll modules
(previously was only .so)
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=124810p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=124809p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=124810
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Mon Jan 10 08:25:21 2005
@@ -8,6 +8,9 @@
=item 1.20-dev
+Apache::TestConfig::inherit_load_module handles .dll modules
+(previously was only .so) [Stas]
+
Apache::TestConfig::should_skip_module now works with regex
patterns. [Stas]
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm?view=diffrev=124810p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pmr1=124809p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pmr2=124810
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Mon Jan 10 08:25:21 2005
@@ -200,7 +200,7 @@
}
my $name = basename $args-[1];
-$name =~ s/\.s[ol]$/.c/; #mod_info.so = mod_info.c
+$name =~ s/\.(s[ol]|dll)$/.c/; #mod_info.so = mod_info.c
$name =~ s/^lib/mod_/; #libphp4.so = mod_php4.c
$name = $modname_alias{$name} if $modname_alias{$name};
svn commit: r124143 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
Author: stas
Date: Tue Jan 4 11:23:51 2005
New Revision: 124143
URL: http://svn.apache.org/viewcvs?view=revrev=124143
Log:
simplify the code
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm?view=diffrev=124143p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pmr1=124142p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pmr2=124143
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
Tue Jan 4 11:23:51 2005
@@ -51,15 +51,16 @@
} else {
eval { require mod_perl };
}
+
+my $mp_ver = $mod_perl::VERSION;
if ($@) {
error You are using mod_perl response handlers ,
but do not have a mod_perl capable Apache.;
Apache::TestRun::exit_perl(0);
}
-if (($rev == 1 and $mod_perl::VERSION = 1.99) ||
-($rev == 2 and $mod_perl::VERSION 1.99)) {
-error Found mod_perl/$mod_perl::VERSION, .
-but it can't be used with $ver;
+if (($rev == 1 $mp_ver = 1.99) ||
+($rev == 2 $mp_ver 1.99)) {
+error Found mod_perl/$mp_ver, but it can't be used with $ver;
Apache::TestRun::exit_perl(0);
}
svn commit: r124142 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
Author: stas
Date: Tue Jan 4 11:23:19 2005
New Revision: 124142
URL: http://svn.apache.org/viewcvs?view=revrev=124142
Log:
# skip temp emacs files (was trying to run them as tests)
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm?view=diffrev=124142p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pmr1=124141p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pmr2=124142
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
Tue Jan 4 11:23:19 2005
@@ -112,6 +112,7 @@
local $_;
for (@tests) {
+next if /\.#/; # skip temp emacs files
my $dir = dirname $_;
if (m:\Wall\.t$:) {
unless ($self-run_t($_)) {
svn commit: r123301 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Author: stas
Date: Fri Dec 24 13:21:15 2004
New Revision: 123301
URL: http://svn.apache.org/viewcvs?view=revrev=123301
Log:
Apache-Test/META.yml is excluded from mp2 distro to make PAUSE indexer
happy, but then perl Makefile.PL complains about a missing META.yml,
so autogenerate it if it wasn't in the distro
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=123301p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=123300p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=123301
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Fri Dec 24 13:21:15 2004
@@ -7,7 +7,13 @@
=over 3
=item 1.19-dev
-
+
+Apache-Test/META.yml is excluded from mp2 distro to make PAUSE indexer
+happy, but then perl Makefile.PL complains about a missing META.yml,
+so autogenerate it if it wasn't in the distro [Stas]
+
+
+
=item 1.18 - December 23, 2004
fix a bug in A-T config generation, when a vhost entry was in
Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=123301p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=123300p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=123301
==
--- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Fri Dec 24
13:21:15 2004
@@ -61,11 +61,16 @@
'Cwd'= '2.06',
);
+# Apache-Test/META.yml is excluded from mp2 distro to make PAUSE
+# indexer happy, but then perl Makefile.PL complains about a missing
+# META.yml, so autogenerate it if it wasn't in the distro
+my $no_meta = TOP_LEVEL ? 1 : 0;
+
WriteMakefile(
NAME = 'Apache::Test',
VERSION = $VERSION,
PREREQ_PM = \%prereq,
-NO_META = 1,
+NO_META = $no_meta,
dist = {
COMPRESS = 'gzip -9f', SUFFIX = 'gz',
},
svn commit: r122987 - /httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes /httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
Author: stas
Date: Tue Dec 21 13:10:47 2004
New Revision: 122987
URL: http://svn.apache.org/viewcvs?view=revrev=122987
Log:
Fix Makefile.PL to make sure that MakeMaker won't descend into
Apache-TestMe. NORECURS doesn't work in older MM versions, so use the
DIR attr as a workaround
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
Modified: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes?view=diffrev=122987p1=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changesr1=122986p2=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changesr2=122987
==
--- httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes
Tue Dec 21 13:10:47 2004
@@ -8,6 +8,10 @@
=item 0.01
+Fix Makefile.PL to make sure that MakeMaker won't descend into
+Apache-TestMe. NORECURS doesn't work in older MM versions, so use the
+DIR attr as a workaround [Stas]
+
new test: minmaxclients.t: testing a bug with vhosts reproducable by
t/TEST -conf followed by t/TEST -maxclients 1 [Stas]
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL?view=diffrev=122987p1=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PLr1=122986p2=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PLr2=122987
==
--- httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
Tue Dec 21 13:10:47 2004
@@ -28,7 +28,7 @@
PREREQ_PM = \%prereq,
VERSION = 0.01,
NORECURS = 1, # don't descend into Apache-TestMe
-
+DIR = [], # NORECURS is broken in older MM
dist = {
COMPRESS = 'gzip -9f', SUFFIX='gz',
},
svn commit: r122798 - /httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Author: stas
Date: Sun Dec 19 19:41:37 2004
New Revision: 122798
URL: http://svn.apache.org/viewcvs?view=revrev=122798
Log:
avoid warning: used only once: possible typo at ...
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=122798p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=122797p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=122798
==
--- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Sun Dec 19
19:41:37 2004
@@ -145,7 +145,6 @@
# now that we're using subversion, make sure that
# .svn directories are skipped during the build process
# for old versions of MakeMaker
-
*MY::libscan = sub {
my $self = shift;
@@ -155,6 +154,8 @@
return $path;
};
+# avoid warning: used only once: possible typo at ...
+*MY::libscan = *MY::libscan;
}
sub MY::postamble {
@@ -207,7 +208,7 @@
$string;
};
-*MY::top_targets = sub {
+*MY::top_targets = sub {
my $self = shift;
my $string = $self-MM::top_targets;
svn commit: r122807 - in httpd/test/trunk/perl-framework/Apache-Test: . Apache-TestItSelf Apache-TestItSelf/Apache-TestMe Apache-TestItSelf/Apache-TestMe/t Apache-TestItSelf/Apache-TestMe/t/basic Apache-TestItSelf/Apache-TestMe/t/conf Apache-TestItSelf/Apache-TestMe/t/response Apache-TestItSelf/Apache-TestMe/t/response/TestBasic Apache-TestItSelf/lib Apache-TestItSelf/lib/MyTest Apache-TestItSelf/sample Apache-TestItSelf/t
Author: stas
Date: Sun Dec 19 20:06:54 2004
New Revision: 122807
URL: http://svn.apache.org/viewcvs?view=revrev=122807
Log:
add Apache-TestItSelf and Apache-TestMe sub-projects.
Added:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Makefile.PL
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/README
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/TEST.PL
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/hello.t
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/modperl_extra.pl
(contents, props changed)
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/response/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Makefile.PL
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/README
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/lib/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/lib/MyTest/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/lib/MyTest/Util.pm
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/sample/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/sample/apache2_modules_testitself_config.pm
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/sample/apache_test_config.pm
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/sample/modperl2_testitself_config.pm
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/TEST.PL
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/interactive.t
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/META.yml
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Added:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes?view=autorev=122807
==
--- (empty file)
+++
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes
Sun Dec 19 20:06:54 2004
@@ -0,0 +1,17 @@
+=head1 NAME
+
+Changes - Apache::TestMe changes logfile
+
+=head1 Changes
+
+=over 4
+
+=item 0.01
+
+write a basic mod_perl test: basic/hello.t
+
+starting the config test suite used by Apache::TestItSelf
+
+=back
+
+=cut
\ No newline at end of file
Added:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Makefile.PL?view=autorev=122807
==
--- (empty file)
+++
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Makefile.PL
Sun Dec 19 20:06:54 2004
@@ -0,0 +1,217 @@
+use 5.005;
+
+use lib qw(../../lib); # Apache-Test/lib
+
+use Apache::TestMM qw(test clean);
+use Apache::TestMM ();
+use Apache::TestReport;
+
+use ExtUtils::MakeMaker ();
+
+my $mp_gen = satisfy_mp_generation();
+warn Goind to build against mod_perl/$mod_perl::VERSION Perl/$]\n;
+
+Apache::TestMM::filter_args();
+
+my @scripts = qw(t/TEST);
+for (@scripts) {
+Apache::TestMM::generate_script($_);
+}
+Apache::TestReport-generate_script;
+
+my @clean_files = (@scripts, qw(t/REPORT));
+
+
+my %common_opts = (
+NAME = 'Apache-TestMe',
+VERSION = '0.01',
+clean = {
+FILES = @clean_files,
+},
+);
+
+if ($mp_gen == 1) {
+require ExtUtils::MakeMaker;
+ExtUtils::MakeMaker::WriteMakefile(
+%common_opts,
+);
+
+}
+else {
+require Apache2;
+require ModPerl::MM;
+ModPerl::MM::WriteMakefile(
+%common_opts,
+);
+}
+# If a specific generation was passed as an argument,
+# if satisfied
+# return the same
svn commit: r122813 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas Date: Sun Dec 19 21:26:52 2004 New Revision: 122813 URL: http://svn.apache.org/viewcvs?view=revrev=122813 Log: use debug() instead of error() to avoid noise Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=122813p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=122812p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=122813 == --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Sun Dec 19 21:26:52 2004 @@ -1881,7 +1881,7 @@ my $mode = (stat _)[2]; my $mode_new = $mode | 0200; chmod $mode_new, $path; -error emptying $path; +debug emptying $path; Apache::TestConfig::custom_config_write($path, ''); chmod $mode, $path; }
svn commit: r122855 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas
Date: Mon Dec 20 07:10:15 2004
New Revision: 122855
URL: http://svn.apache.org/viewcvs?view=revrev=122855
Log:
refactor some dups into find_and_load_module() wrapper
Contributed by: Chia-Liang Kao [EMAIL PROTECTED]
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=122855p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=122854p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=122855
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Mon Dec 20 07:10:15 2004
@@ -8,6 +8,10 @@
=item 1.18-dev
+
+new TestConfig wrapper find_and_load_module [Chia-Liang Kao chialiang
+gmail.com]
+
add Apache-TestItSelf and Apache-TestMe sub-projects. [Stas]
add various straps to aid the new Apache-TestItSelf sub-project, which
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=122855p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=122854p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=122855
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Mon Dec 20 07:10:15 2004
@@ -1212,6 +1212,18 @@
};
}
+sub find_and_load_module {
+my ($self, $name) = @_;
+my $mod_path = $self-find_apache_module($name) or return;
+my ($sym) = $name =~ m/mod_(\w+)\./;
+
+if ($mod_path -e $mod_path) {
+$self-preamble(IfModule = !$name,
+qq{LoadModule ${sym}_module $mod_path\n});
+}
+return 1;
+}
+
sub replace_vhost_modules {
my $self = shift;
@@ -1265,11 +1277,7 @@
# handle the case when mod_mime is built as a shared object
# but wasn't included in the system-wide httpd.conf
-my $mod_mime = $self-find_apache_module('mod_mime.so');
-if ($mod_mime -e $mod_mime) {
-$self-preamble(IfModule = '!mod_mime.c',
-qq{LoadModule mime_module $mod_mime\n});
-}
+$self-find_and_load_module('mod_mime.so');
unless ($self-{inherit_config}-{TypesConfig}) {
my $types = catfile $self-{vars}-{t_conf}, 'mime.types';
@@ -1521,6 +1529,8 @@
my $out = $self-genfile($conf_file);
+$self-find_and_load_module('mod_alias.so');
+
$self-preamble_run($out);
for my $name (qw(user group)) { #win32/cygwin do not support
@@ -1542,14 +1552,6 @@
# handle the case when mod_alias is built as a shared object
# but wasn't included in the system-wide httpd.conf
-my $mod_alias = $self-find_apache_module('mod_alias.so');
-if ($mod_alias -e $mod_alias) {
-print $out EOF;
-IfModule !mod_alias.c
-LoadModule alias_module $mod_alias
-/IfModule
-EOF
-}
print $out IfModule mod_alias.c\n;
for (keys %aliases) {
svn commit: r122882 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm /httpd/test/trunk/perl-framework/Apache-Test/t/more/all.t
Author: stas
Date: Mon Dec 20 13:37:34 2004
New Revision: 122882
URL: http://svn.apache.org/viewcvs?view=revrev=122882
Log:
cleanups
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
httpd/test/trunk/perl-framework/Apache-Test/t/more/all.t
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm?view=diffrev=122882p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr1=122881p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr2=122882
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm Mon Dec
20 13:37:34 2004
@@ -132,7 +132,6 @@
#so Perl's Test.pm can be run inside mod_perl
sub test_pm_refresh {
if (@testmore) {
-
Test::Builder-reset;
Test::Builder-output(\*STDOUT);
Modified: httpd/test/trunk/perl-framework/Apache-Test/t/more/all.t
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/t/more/all.t?view=diffrev=122882p1=httpd/test/trunk/perl-framework/Apache-Test/t/more/all.tr1=122881p2=httpd/test/trunk/perl-framework/Apache-Test/t/more/all.tr2=122882
==
--- httpd/test/trunk/perl-framework/Apache-Test/t/more/all.t(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/t/more/all.tMon Dec 20
13:37:34 2004
@@ -6,8 +6,8 @@
use Apache::Test;
-plan tests = 1, (need_min_module_version(qw(Test::More 0.48_01))
- need_module('mod_perl.c'));
+plan tests = 1, need need_min_module_version(qw(Test::More 0.48_01)),
+need_module('mod_perl.c');
ok 1;
svn commit: r122883 - /httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
Author: stas
Date: Mon Dec 20 13:47:29 2004
New Revision: 122883
URL: http://svn.apache.org/viewcvs?view=revrev=122883
Log:
use a proper skip block
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t?view=diffrev=122883p1=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.tr1=122882p2=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.tr2=122883
==
--- httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/httpd_arg.t
Mon Dec 20 13:47:29 2004
@@ -104,13 +104,12 @@
unlike $err, qr/\[ error\]/, $cmd;
# test that httpd is found in t/REPORT (if exists)
-$cmd = t/REPORT;
-if (-e $cmd) {
+SKIP: {
+$cmd = t/REPORT;
+skip $cmd doesn't exist, 1 unless -e $cmd;
+
($out, $err) = myrun3($cmd);
like $out, qr/Server version: $c-{httpd_version}/, $cmd;
-}
-else {
-ok 1;
}
}
svn commit: r122906 - in httpd/test/trunk/perl-framework/Apache-Test: . Apache-TestItSelf Apache-TestItSelf/Apache-TestMe Apache-TestItSelf/Apache-TestMe/t/basic Apache-TestItSelf/Apache-TestMe/t/conf Apache-TestItSelf/Apache-TestMe/t/response/TestBasic Apache-TestItSelf/t lib/Apache
Author: stas Date: Mon Dec 20 15:42:20 2004 New Revision: 122906 URL: http://svn.apache.org/viewcvs?view=revrev=122906 Log: - fix a bug in A-T config generation, when a vhost entry was in autogenerated httpd.conf (e.g. coming from .pm file) and another from extra.conf.in. We used to have a ports collision, since extra.conf wasn't reparsed and the same port was getting assigned to more than one vhost entry, preventing server startup: default_ VirtualHost overlap on port 8530, the first has precedence (98)Address already in use: make_sock: could not bind to address 0.0.0.0:8530 no listening sockets available, shutting down could be reproduced with t/TEST -conf followed by t/TEST -maxclients 1 in the mp2 test suite (or the new Apache-TestMe test suite, which now includes a special setup for this bug). - added a test reproducing this problem in Apache-TestItSelf - added the setup required to reproduce this problem in Apache-TestMe Added: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/vhost.t (contents, props changed) httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/extra.conf.in httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm (contents, props changed) httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/t/minmaxclients.t (contents, props changed) Modified: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/ (props changed) httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/ (props changed) httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Changes httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes?view=diffrev=122906p1=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changesr1=122905p2=httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changesr2=122906 == --- httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/Changes Mon Dec 20 15:42:20 2004 @@ -8,9 +8,13 @@ =item 0.01 -write a basic mod_perl test: basic/hello.t +new test basic/vhost.t which introduces a vhost entry in .pm. also +added a dummy vhost entry in t/conf/extra.conf.in, the setup needed by +t/minmaxclients.t from Apache-TestItSelf [Stas] -starting the config test suite used by Apache::TestItSelf +write a basic mod_perl test: basic/hello.t [Stas] + +starting the config test suite used by Apache::TestItSelf [Stas] =back Added: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/vhost.t Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/vhost.t?view=autorev=122906 == --- (empty file) +++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/basic/vhost.t Mon Dec 20 15:42:20 2004 @@ -0,0 +1,7 @@ +use Apache::TestUtil; +use Apache::TestRequest 'GET_BODY_ASSERT'; + +my $module = 'TestBasic::Vhost'; +my $url= Apache::TestRequest::module2url($module); +t_debug(connecting to $url); +print GET_BODY_ASSERT $url; Added: httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/extra.conf.in Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/extra.conf.in?view=autorev=122906 == --- (empty file) +++ httpd/test/trunk/perl-framework/Apache-Test/Apache-TestItSelf/Apache-TestMe/t/conf/extra.conf.in Mon Dec 20 15:42:20 2004 @@ -0,0 +1,16 @@ +# this vhost entry is needed to check that when t/TEST -maxclients 1 +# or similar is called after t/TEST -conf was run, and extra.conf +# includes a vhost entry and httpd.conf includes an autogenerated +# vhost entry from some .pm file, we used to have a collision, since +# extra.conf wasn't reparsed and the same port was getting assigned to +# more than one vhost entry, preventing server startup: +# +#default_ VirtualHost overlap on port 8530, the first has precedence +#(98)Address already in use: make_sock: could not bind to address +#0.0.0.0:8530 no listening sockets available, shutting down +# +# XXX: for now using a dummy vhost entry. later if needed to put a +# real vhost
svn commit: r122719 - /httpd/test/trunk/perl-framework/Apache-Test /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/MANIFEST /httpd/test/trunk/perl-framework/Apache-Test/META.yml
Author: stas Date: Sat Dec 18 12:10:02 2004 New Revision: 122719 URL: http://svn.apache.org/viewcvs?view=revrev=122719 Log: META.yml is now locally maintained. we need to tell PAUSE indexer not to try to index HTTP::Request::Common and warnings packages, which happen to be used by A-T Added: httpd/test/trunk/perl-framework/Apache-Test/META.yml Modified: httpd/test/trunk/perl-framework/Apache-Test/ (props changed) httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/MANIFEST Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=122719p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=122718p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=122719 == --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Sat Dec 18 12:10:02 2004 @@ -8,6 +8,9 @@ =item 1.18-dev +META.yml is now locally maintained. we need to tell PAUSE indexer not +to try to index HTTP::Request::Common and warnings packages, which +happen to be used by A-T [Stas] Modified: httpd/test/trunk/perl-framework/Apache-Test/MANIFEST Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/MANIFEST?view=diffrev=122719p1=httpd/test/trunk/perl-framework/Apache-Test/MANIFESTr1=122718p2=httpd/test/trunk/perl-framework/Apache-Test/MANIFESTr2=122719 == --- httpd/test/trunk/perl-framework/Apache-Test/MANIFEST(original) +++ httpd/test/trunk/perl-framework/Apache-Test/MANIFESTSat Dec 18 12:10:02 2004 @@ -2,6 +2,7 @@ CONTRIBUTORS LICENSE MANIFEST +META.yml Makefile.PL README INSTALL Added: httpd/test/trunk/perl-framework/Apache-Test/META.yml Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/META.yml?view=autorev=122719 == --- (empty file) +++ httpd/test/trunk/perl-framework/Apache-Test/META.ymlSat Dec 18 12:10:02 2004 @@ -0,0 +1,17 @@ +name: Apache-Test +version_from: lib/Apache/Test.pm +installdirs: site + +requires: +Cwd: 2.06 +File::Spec:0.8 + +distribution_type: module + +no_index: +package: +- HTTP::Request::Common +- warnings + + +
svn commit: r122599 - /httpd/test/trunk/perl-framework/Apache-Test/ToDo
Author: stas Date: Thu Dec 16 15:55:15 2004 New Revision: 122599 URL: http://svn.apache.org/viewcvs?view=revrev=122599 Log: on linux most symbols are resolved on demand, but this is not the case with certain other platforms. so testing on linux may not detect some problems, exposed on other platforms. env var PERL_DL_NONLAZY=1 tries to resolve all symbols at load time. Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/ToDo?view=diffrev=122599p1=httpd/test/trunk/perl-framework/Apache-Test/ToDor1=122598p2=httpd/test/trunk/perl-framework/Apache-Test/ToDor2=122599 == --- httpd/test/trunk/perl-framework/Apache-Test/ToDo(original) +++ httpd/test/trunk/perl-framework/Apache-Test/ToDoThu Dec 16 15:55:15 2004 @@ -1,3 +1,19 @@ +- on linux most symbols are resolved on demand, but this is not the + case with certain other platforms. so testing on linux may not + detect some problems, exposed on other platforms. env var + PERL_DL_NONLAZY=1 tries to resolve all symbols at load time. we + could always enforce that with this patch: + +--- Apache-Test/lib/Apache/TestRun.pm 16 Apr 2004 20:29:23 - 1.166 Apache-Test/lib/Apache/TestRun.pm 6 May 2004 04:43:01 - +@@ -643,7 +643,7 @@ + } + close $sh; + +-$original_command = ulimit -c unlimited; $original_command; ++$original_command = ulimit -c unlimited; PERL_DL_NONLAZY=1 $original_comma +nd; + - general config: adjust Apache/TestConfig.pm not to write irrelevant httpd.conf sections (e.g. IfModule prefork.c for win32, and vice versa, A-T knows exactly what mpm it needs to write the config for).
svn commit: r111982 - /httpd/test/trunk/perl-framework/Apache-Test/ToDo
Author: stas Date: Wed Dec 15 07:59:29 2004 New Revision: 111982 URL: http://svn.apache.org/viewcvs?view=revrev=111982 Log: - sometimes the server aborts completely after the test suite has run some of the tests (e.g. win32's server has crashed and no replacement is available), but the client part continues to run tests unaware of that problem. what would be nice to be able to detect that the server is gone and somehow abort the test suite Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/ToDo?view=diffrev=111982p1=httpd/test/trunk/perl-framework/Apache-Test/ToDor1=111981p2=httpd/test/trunk/perl-framework/Apache-Test/ToDor2=111982 == --- httpd/test/trunk/perl-framework/Apache-Test/ToDo(original) +++ httpd/test/trunk/perl-framework/Apache-Test/ToDoWed Dec 15 07:59:29 2004 @@ -1,3 +1,9 @@ +- sometimes the server aborts completely after the test suite has run + some of the tests (e.g. win32's server has crashed and no + replacement is available), but the client part continues to run + tests unaware of that problem. what would be nice to be able to + detect that the server is gone and somehow abort the test suite + - Custom sticky config: invalidate invalid bits of the saved config, e.g. if apxs is saved but can't be found on the filesystem. So if someone installs Apache in one location, runs A-T which saves that
svn commit: r111983 - /httpd/test/trunk/perl-framework/Apache-Test/ToDo
Author: stas Date: Wed Dec 15 08:08:52 2004 New Revision: 111983 URL: http://svn.apache.org/viewcvs?view=revrev=111983 Log: - general config: adjust Apache/TestConfig.pm not to write irrelevant httpd.conf sections (e.g. IfModule prefork.c for win32, and vice versa, A-T knows exactly what mpm it needs to write the config for). Thus reducing the clutter. - winnt case: Apache/TestConfig.pm config for IfModule mpm_winnt.c before Apache-2.0.50 ThreadsPerChild had to be at least as big as the number of Vhosts. This was fixed in 2.0.50. Since A-T knows the httpd version, it shouldn't start so many threads for httpd = 2.0.50, but @[EMAIL PROTECTED] Also add BACK_COMPAT_MARKER in the logic so when no longer support httpd 2.0.50, this logic could be removed. Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Modified: httpd/test/trunk/perl-framework/Apache-Test/ToDo Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/ToDo?view=diffrev=111983p1=httpd/test/trunk/perl-framework/Apache-Test/ToDor1=111982p2=httpd/test/trunk/perl-framework/Apache-Test/ToDor2=111983 == --- httpd/test/trunk/perl-framework/Apache-Test/ToDo(original) +++ httpd/test/trunk/perl-framework/Apache-Test/ToDoWed Dec 15 08:08:52 2004 @@ -1,3 +1,15 @@ +- general config: adjust Apache/TestConfig.pm not to write irrelevant + httpd.conf sections (e.g. IfModule prefork.c for win32, and vice + versa, A-T knows exactly what mpm it needs to write the config for). + Thus reducing the clutter. + +- winnt case: Apache/TestConfig.pm config for IfModule mpm_winnt.c + before Apache-2.0.50 ThreadsPerChild had to be at least as big as + the number of Vhosts. This was fixed in 2.0.50. Since A-T knows the + httpd version, it shouldn't start so many threads for httpd = + 2.0.50, but @[EMAIL PROTECTED] Also add BACK_COMPAT_MARKER in the logic + so when no longer support httpd 2.0.50, this logic could be removed. + - sometimes the server aborts completely after the test suite has run some of the tests (e.g. win32's server has crashed and no replacement is available), but the client part continues to run
svn commit: r111992 - /httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Author: stas
Date: Wed Dec 15 08:31:24 2004
New Revision: 111992
URL: http://svn.apache.org/viewcvs?view=revrev=111992
Log:
- override sub MY::libscan only if building A-T outside modperl2
- make this override compile-time
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=111992p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=111991p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=111992
==
--- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Wed Dec 15
08:31:24 2004
@@ -63,6 +63,7 @@
NAME = 'Apache::Test',
VERSION = $VERSION,
PREREQ_PM = \%prereq,
+NO_META = 1,
dist = {
COMPRESS = 'gzip -9f', SUFFIX = 'gz',
},
@@ -140,12 +141,12 @@
}
}
-if ($ExtUtils::MakeMaker::VERSION 6.06) {
+if (TOP_LEVEL $ExtUtils::MakeMaker::VERSION 6.06) {
# now that we're using subversion, make sure that
# .svn directories are skipped during the build process
# for old versions of MakeMaker
-sub MY::libscan {
+*MY::libscan = sub {
my $self = shift;
my $path = shift;
@@ -153,7 +154,7 @@
return '' if $path =~ /\B\.svn\b/;
return $path;
-}
+};
}
sub MY::postamble {
svn commit: r111613 - /httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL /httpd/test/trunk/perl-framework/Apache-Test/RELEASE
Author: stas Date: Sat Dec 11 11:12:34 2004 New Revision: 111613 URL: http://svn.apache.org/viewcvs?view=revrev=111613 Log: update release procedures/code to use svn Submitted by: gozer Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL httpd/test/trunk/perl-framework/Apache-Test/RELEASE Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=111613p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=111612p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=111613 == --- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Sat Dec 11 11:12:34 2004 @@ -162,8 +162,8 @@ my $string = $self-MM::postamble; $string .= 'EOF'; -cvs_tag : - cvs tag APACHE_TEST_$(VERSION_SYM) . +tag : + svn copy . https://svn.apache.org/repos/asf/httpd/test/tags/APACHE_TEST_$(VERSION_SYM) @echo update lib/Apache/Test.pm VERSION now EOF Modified: httpd/test/trunk/perl-framework/Apache-Test/RELEASE Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/RELEASE?view=diffrev=111613p1=httpd/test/trunk/perl-framework/Apache-Test/RELEASEr1=111612p2=httpd/test/trunk/perl-framework/Apache-Test/RELEASEr2=111613 == --- httpd/test/trunk/perl-framework/Apache-Test/RELEASE (original) +++ httpd/test/trunk/perl-framework/Apache-Test/RELEASE Sat Dec 11 11:12:34 2004 @@ -1,7 +1,7 @@ Instructions for Apache-Test Release Manager 1. 'make dist' - to make sure nothing is missing from the manifest, - etc. Now test this generated package (not cvs) with as many + etc. Now test this generated package (not svn) with as many configurations as possible on as many platforms as possible. a. nuke any preinstalled Apache-Test libs and run 'make test' @@ -29,13 +29,13 @@ b. rerun: % perl Makefile.PL make sure tag looks right - % make -n cvs_tag + % make -n tag c. commit Changes - % cvs ci Changes + % svn ci Changes d. tag - % make cvs_tag + % make tag e. create the final package % make dist @@ -71,4 +71,4 @@ command. d. commit Changes - % cvs ci Changes RELEASE lib/Apache/Test.pm + % svn ci Changes RELEASE lib/Apache/Test.pm
svn commit: r111614 - /httpd/test/trunk/perl-framework/Apache-Test/Changes
Author: stas Date: Sat Dec 11 11:15:10 2004 New Revision: 111614 URL: http://svn.apache.org/viewcvs?view=revrev=111614 Log: 1.17 release Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=111614p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=111613p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=111614 == --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Sat Dec 11 11:15:10 2004 @@ -6,7 +6,7 @@ =over 3 -=item 1.17-dev +=item 1.17 - December 11, 2004 Apache::TestHandler: need to load Apache::RequestIO for mp2 for puts() to work [Stas]
svn commit: r111619 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
Author: stas
Date: Sat Dec 11 11:38:04 2004
New Revision: 111619
URL: http://svn.apache.org/viewcvs?view=revrev=111619
Log:
move $VERSION to the top, so don't have to search it on update
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm?view=diffrev=111619p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr1=111618p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr2=111619
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm Sat Dec
11 11:38:04 2004
@@ -23,6 +23,8 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
+$VERSION = '1.17';
+
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
need_apache_version need_perl need_min_perl_version
@@ -39,8 +41,6 @@
my @test_more_exports = grep { ! /^(ok|skip|plan)$/ } @EXPORT;
%EXPORT_TAGS = (withtestmore = [EMAIL PROTECTED]);
-
-$VERSION = '1.17';
%SubTests = ();
@SkipReasons = ();
svn commit: r111215 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Author: stas
Date: Tue Dec 7 21:26:12 2004
New Revision: 111215
URL: http://svn.apache.org/viewcvs?view=revrev=111215
Log:
document URL Manipulation Functions
Contributed by: Christopher H. Laco [EMAIL PROTECTED]
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm?view=diffrev=111215p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr1=111214p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr2=111215
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Tue Dec 7 21:26:12 2004
@@ -815,6 +815,9 @@
CApache::TestRequest exports a number of functions that will likely
prove convenient for use in the majority of your request tests.
+
+
+
=head2 Optional Parameters
Each function also takes a number of optional arguments.
@@ -1087,6 +1090,70 @@
testing what options the Apache server supports. Consult the HTTPD 1.1
specification, section 9.2, at
Ihttp://www.faqs.org/rfcs/rfc2616.html for more information.
+
+
+
+
+
+=head2 URL Manipulation Functions
+
+CApache::TestRequest also includes a few helper functions to aid in
+the creation of urls used in the functions above.
+
+
+
+=head3 Cmodule2path
+
+ $path = module2path($module_name);
+
+Convert a module name to a path, safe for use in the various request
+methods above. e.g. C:: can't be used in URLs on win32. For example:
+
+ $path = module2path('Foo::Bar');
+
+returns:
+
+ /Foo__Bar
+
+
+
+
+=head3 Cmodule2url
+
+ $url = Apache::TestRequest::module2url($module);
+ $url = Apache::TestRequest::module2url($module, %options);
+
+Convert a module name to a full URL including the current
+configurations Chostname:port and sets Cmodule accordingly.
+
+ $url = Apache::TestRequest::module2url('Foo::Bar');
+
+returns:
+
+ http://$hostname:$port/Foo__Bar
+
+The default scheme used is Chttp. You can override this by passing
+your preferred scheme into an optional second param. For example:
+
+ $module = 'MyTestModule::TestHandler';
+ $url = Apache::TestRequest::module2uri($module, {scheme = 'https'});
+
+returns:
+
+ https://$hostname:$port/MyTestModule__TestHandler
+
+You may also override the default path with a path of your own:
+
+ $module = 'MyTestModule::TestHandler';
+ $url = Apache::TestRequest::module2uri($module, {path = '/foo'});
+
+returns:
+
+ http://$hostname:$port/foo
+
+
+
+
=head1 ENVIRONMENT VARIABLES
svn commit: r111218 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas
Date: Tue Dec 7 21:52:19 2004
New Revision: 111218
URL: http://svn.apache.org/viewcvs?view=revrev=111218
Log:
properly untaint path on win32 (different separator: ';')
move the untaint code into its own wrapper: untaint_path()
contributed by: Randy Kobes
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=111218p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=111217p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=111218
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Tue Dec 7 21:52:19 2004
@@ -1045,11 +1045,7 @@
my($self, $cmd) = @_;
# untaint some %ENV fields
local @ENV{ qw(IFS CDPATH ENV BASH_ENV) };
-
-# Temporarily untaint PATH
-(local $ENV{PATH}) = ( $ENV{PATH} =~ /(.*)/ );
-# -T disallows relative directories in the PATH
-$ENV{PATH} = join ':', grep !/^\./, split /:/, $ENV{PATH};
+local $ENV{PATH} = untaint_path($ENV{PATH});
# launder for -T
$cmd = $1 if $cmd =~ /(.*)/;
@@ -1663,7 +1659,8 @@
return unless $self-{APXS};
my $val;
unless (exists $self-{_apxs}{$q}) {
-local @ENV{ qw(PATH IFS CDPATH ENV BASH_ENV) };
+local @ENV{ qw(IFS CDPATH ENV BASH_ENV) };
+local $ENV{PATH} = untaint_path($ENV{PATH});
my $devnull = devnull();
my $apxs = shell_ready($self-{APXS});
$val = qx($apxs -q $q 2$devnull);
@@ -1682,6 +1679,17 @@
}
}
$self-{_apxs}{$q};
+}
+
+# Temporarily untaint PATH
+sub untaint_path {
+my $path = shift;
+($path) = ( $path =~ /(.*)/ );
+# win32 uses ';' for a path separator, assume others use ':'
+my $sep = WIN32 ? ';' : ':';
+# -T disallows relative directories in the PATH
+$path = join $sep, grep !/^\./, split /$sep/, $path;
+return $path;
}
sub pop_dir {
svn commit: r111221 - /httpd/test/trunk/perl-framework/Apache-Test/Changes
Author: stas Date: Tue Dec 7 21:59:24 2004 New Revision: 111221 URL: http://svn.apache.org/viewcvs?view=revrev=111221 Log: log the last change Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=111221p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=111220p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=111221 == --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Tue Dec 7 21:59:24 2004 @@ -8,6 +8,8 @@ =item 1.17-dev +new Apache::TestConfig wrapper untaint_path() [Randy Kobes] + fix the config thaw() functionality (when top_dir wasn't in @INC the saved config won't be loaded and tests will blow) [Stas]
svn commit: r111310 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Author: stas
Date: Wed Dec 8 12:41:15 2004
New Revision: 111310
URL: http://svn.apache.org/viewcvs?view=revrev=111310
Log:
a few docs fixes
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm?view=diffrev=111310p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr1=111309p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr2=111310
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Wed Dec 8 12:41:15 2004
@@ -1104,12 +1104,12 @@
=head3 Cmodule2path
- $path = module2path($module_name);
+ $path = Apache::TestRequest::module2path($module_name);
Convert a module name to a path, safe for use in the various request
methods above. e.g. C:: can't be used in URLs on win32. For example:
- $path = module2path('Foo::Bar');
+ $path = Apache::TestRequest::module2path('Foo::Bar');
returns:
@@ -1121,7 +1121,7 @@
=head3 Cmodule2url
$url = Apache::TestRequest::module2url($module);
- $url = Apache::TestRequest::module2url($module, %options);
+ $url = Apache::TestRequest::module2url($module, \%options);
Convert a module name to a full URL including the current
configurations Chostname:port and sets Cmodule accordingly.
svn commit: r110080 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Author: stas
Date: Mon Dec 6 21:19:39 2004
New Revision: 110080
URL: http://svn.apache.org/viewcvs?view=revrev=110080
Log:
new wrapper Apache::TestRequest::module2url to simplify handling of
vhosts in the client.
Contributed by: Christopher H. Laco apache-test chrislaco.com
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=110080p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=110079p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=110080
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Mon Dec 6 21:19:39 2004
@@ -8,6 +8,10 @@
=item 1.17-dev
+new wrapper Apache::TestRequest::module2url to simplify handling of
+vhosts in the client. [Christopher H. Laco apache-test
+chrislaco.com]
+
resolve -T taint issues: [Stas]
- untaint $cmd in Apache::TestConfig::open_cmd
- fix the tainting of @INC (by untaintinig top_dir variable)
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm?view=diffrev=110080p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr1=110079p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr2=110080
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Mon Dec 6 21:19:39 2004
@@ -107,6 +107,21 @@
return $path;
}
+sub module2url {
+my $module = shift;
+my $opt = shift || {};
+my $scheme = $opt-{scheme} || 'http';
+my $path = $opt-{path} || module2path($module);
+
+Apache::TestRequest::module($module);
+
+my $config = Apache::Test::config();
+my $hostport = hostport($config);
+
+$path =~ s|^/||;
+return $scheme://$hostport/$path;
+}
+
sub user_agent {
my $args = [EMAIL PROTECTED];
svn commit: r110083 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Author: stas
Date: Mon Dec 6 21:32:43 2004
New Revision: 110083
URL: http://svn.apache.org/viewcvs?view=revrev=110083
Log:
simplify
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm?view=diffrev=110083p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr1=110082p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr2=110083
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Mon Dec 6 21:32:43 2004
@@ -113,7 +113,7 @@
my $scheme = $opt-{scheme} || 'http';
my $path = $opt-{path} || module2path($module);
-Apache::TestRequest::module($module);
+module($module);
my $config = Apache::Test::config();
my $hostport = hostport($config);
svn commit: r109806 - /httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Author: stas
Date: Sat Dec 4 07:41:15 2004
New Revision: 109806
URL: http://svn.apache.org/viewcvs?view=revrev=109806
Log:
tidy up
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=109806p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=109805p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=109806
==
--- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Sat Dec 4
07:41:15 2004
@@ -64,7 +64,7 @@
VERSION = $VERSION,
PREREQ_PM = \%prereq,
dist = {
-COMPRESS = 'gzip -9f', SUFFIX='gz',
+COMPRESS = 'gzip -9f', SUFFIX = 'gz',
},
clean = {
FILES = @clean_files,
svn commit: r109816 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas
Date: Sat Dec 4 09:39:25 2004
New Revision: 109816
URL: http://svn.apache.org/viewcvs?view=revrev=109816
Log:
fix Apache::TestConfig::open_cmd to run properly under -T
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=109816p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=109815p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=109816
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Sat Dec 4 09:39:25 2004
@@ -8,6 +8,8 @@
=item 1.17-dev
+fix Apache::TestConfig::open_cmd to run properly under -T [Stas]
+
require Cwd 2.06 or higher (to solve File::Spec::rel2abs problems
under -T). Enforce the modules version requirements for those who
aren't running under CPAN/CPANPLUS shell) [Stas]
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=109816p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=109815p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=109816
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Sat Dec 4 09:39:25 2004
@@ -1037,10 +1037,13 @@
# untaint some %ENV fields
local @ENV{ qw(IFS CDPATH ENV BASH_ENV) };
-# Temporarly untaint PATH
+# Temporarily untaint PATH
(local $ENV{PATH}) = ( $ENV{PATH} =~ /(.*)/ );
# -T disallows relative directories in the PATH
$ENV{PATH} = join ':', grep !/^\./, split /:/, $ENV{PATH};
+
+# launder for -T
+$cmd =~ /(.*)/; $cmd = $1;
my $handle = Symbol::gensym();
open $handle, $cmd| or die $cmd failed: $!;
svn commit: r109725 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
Author: stas Date: Fri Dec 3 12:05:34 2004 New Revision: 109725 URL: http://svn.apache.org/viewcvs?view=revrev=109725 Log: Apache::TestTrace: don't export by default the 'todo' utility's symbol since it collides with Test::More Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=109725p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=109724p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=109725 == --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Fri Dec 3 12:05:34 2004 @@ -8,6 +8,9 @@ =item 1.17-dev +Apache::TestTrace: don't export by default the 'todo' utility's symbol +since it collides with Test::More [Stas] + Tweak the handling of mp2 source build case in Apache::TestConfig::httpd_config(), apparently mp2 source build doesn't always know where httpd/apxs are, so we need to give a better Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm?view=diffrev=109725p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pmr1=109724p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pmr2=109725 == --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm Fri Dec 3 12:05:34 2004 @@ -27,7 +27,7 @@ } @ISA = qw(Exporter); [EMAIL PROTECTED] = (@Subs); [EMAIL PROTECTED] = (@Levels); $VERSION = '0.01'; use subs (@Subs);
svn commit: r109735 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
Author: stas
Date: Fri Dec 3 15:33:17 2004
New Revision: 109735
URL: http://svn.apache.org/viewcvs?view=revrev=109735
Log:
fix the breakage caused by the last commit
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm?view=diffrev=109735p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pmr1=109734p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pmr2=109735
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestTrace.pm Fri Dec
3 15:33:17 2004
@@ -18,18 +18,20 @@
use warnings FATAL = 'all';
use Exporter ();
-use vars qw(@Levels @Utils @Subs @ISA @EXPORT $VERSION $Level $LogFH);
+use vars qw(@Levels @Utils @Level_subs @Util_subs
+@ISA @EXPORT $VERSION $Level $LogFH);
BEGIN {
@Levels = qw(emerg alert crit error warning notice info debug);
@Utils = qw(todo);
-@Subs = map {($_, ${_}_mark, ${_}_sub)} (@Levels, @Utils);
+@Level_subs = map {($_, ${_}_mark, ${_}_sub)} (@Levels);
+@Util_subs = map {($_, ${_}_mark, ${_}_sub)} (@Utils);
}
@ISA = qw(Exporter);
[EMAIL PROTECTED] = (@Levels);
[EMAIL PROTECTED] = (@Level_subs);
$VERSION = '0.01';
-use subs (@Subs);
+use subs (@Level_subs, @Util_subs);
# default settings overrideable by users
$Level = undef;
svn commit: r109451 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm
Author: stas Date: Wed Dec 1 21:17:21 2004 New Revision: 109451 URL: http://svn.apache.org/viewcvs?view=revrev=109451 Log: docs: be consistent at how need_* is invoked Contributed by: Christopher H. Laco [EMAIL PROTECTED] Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm?view=diffrev=109451p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr1=109450p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pmr2=109451 == --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/Test.pm Wed Dec 1 21:17:21 2004 @@ -604,7 +604,7 @@ the tests will be skipped if the function returns a false value. For example: -plan tests = 5, \need_lwp; +plan tests = 5, need_lwp; the test will be skipped if LWP is not available @@ -654,13 +654,13 @@ =item need_http11 - plan tests = 5, need_http11; + plan tests = 5, need_http11; Require HTTP/1.1 support. =item need_ssl - plan tests = 5, need_ssl; + plan tests = 5, need_ssl; Require SSL support. @@ -668,13 +668,13 @@ =item need_lwp - plan tests = 5, need_lwp; + plan tests = 5, need_lwp; Require LWP support. =item need_cgi - plan tests = 5, need_cgi; + plan tests = 5, need_cgi; Requires mod_cgi or mod_cgid to be installed.
svn commit: r109452 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Author: stas
Date: Wed Dec 1 21:18:18 2004
New Revision: 109452
URL: http://svn.apache.org/viewcvs?view=revrev=109452
Log:
document how to get cookies persist between requests
Contributed by: Christopher H. Laco [EMAIL PROTECTED]
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm?view=diffrev=109452p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr1=109451p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pmr2=109452
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Wed Dec 1 21:18:18 2004
@@ -780,6 +780,21 @@
installed. It's best, therefore, to check Chave_lwp before running
tests that rely on a redirection from CPOST.
+Sometimes it is desireable to have CApache::TestRequest remember
+cookies sent by the pages you are testing and send them back to the
+server on subsequent requests. This is especially necessary when
+testing pages whose functionality relies on sessions or the presence
+of preferences stored in cookies.
+
+By default, CLWP::UserAgent does Bnot remember cookies between
+requests. You can tell it to remember cookies between request by
+adding:
+
+ Apache::TestRequest::user_agent(cookie_jar = {});
+
+before issuing the requests.
+
+
=head1 FUNCTIONS
CApache::TestRequest exports a number of functions that will likely
@@ -836,6 +851,11 @@
Sends a simple GET request to the Apache test server. Returns an
CHTTP::Response object.
+
+You can also supply additional headers to be sent with the request by
+adding their name/value pairs after the Curl parameter, for example:
+
+ my $res = GET $url, 'Accept-Language' = 'de,en-us,en;q=0.5';
=head3 GET_STR
svn commit: r109277 - in httpd/test/trunk/perl-framework/Apache-Test: . t/cgi-bin t/conf
Author: stas
Date: Tue Nov 30 20:23:14 2004
New Revision: 109277
URL: http://svn.apache.org/viewcvs?view=revrev=109277
Log:
Add cookie jar tests
Contributed by: Christopher H. Laco [EMAIL PROTECTED]
Added:
httpd/test/trunk/perl-framework/Apache-Test/t/cgi-bin/
httpd/test/trunk/perl-framework/Apache-Test/t/cgi-bin/cookies.pl.PL
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/MANIFEST
httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.in
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=109277p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=109276p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=109277
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Tue Nov 30 20:23:14 2004
@@ -8,6 +8,9 @@
=item 1.17-dev
+Add cookie jar tests [Christopher H. Laco apache-test
+chrislaco.com]
+
Don't run interactive prompts when STDIN is closed [Stas]
Add LockFile directive in the autogenerated httpd.conf, which points
Modified: httpd/test/trunk/perl-framework/Apache-Test/MANIFEST
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/MANIFEST?view=diffrev=109277p1=httpd/test/trunk/perl-framework/Apache-Test/MANIFESTr1=109276p2=httpd/test/trunk/perl-framework/Apache-Test/MANIFESTr2=109277
==
--- httpd/test/trunk/perl-framework/Apache-Test/MANIFEST(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/MANIFESTTue Nov 30
20:23:14 2004
@@ -41,6 +41,8 @@
t/TEST.PL
t/bad_coding.t
t/conf/extra.conf.in
+t/cookies.t
+t/cgi-bin/cookies.pl.PL
t/ping.t
t/redirect.t
t/request.t
Modified: httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL?view=diffrev=109277p1=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr1=109276p2=httpd/test/trunk/perl-framework/Apache-Test/Makefile.PLr2=109277
==
--- httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Makefile.PL Tue Nov 30
20:23:14 2004
@@ -12,6 +12,7 @@
use ExtUtils::MakeMaker;
use Symbol;
+use File::Find qw(finddepth);
use Apache::TestMM qw(test clean); #enable 'make test and make clean'
use Apache::TestRun;
@@ -26,6 +27,11 @@
Apache::TestMM::filter_args();
my @scripts = qw(t/TEST);
+
+finddepth(sub {
+return unless /(.*?\.pl)\.PL$/;
+push @scripts, $File::Find::dir/$1;
+}, '.');
for (@scripts) {
Apache::TestMM::generate_script($_);
Added: httpd/test/trunk/perl-framework/Apache-Test/t/cgi-bin/cookies.pl.PL
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/t/cgi-bin/cookies.pl.PL?view=autorev=109277
==
--- (empty file)
+++ httpd/test/trunk/perl-framework/Apache-Test/t/cgi-bin/cookies.pl.PL Tue Nov
30 20:23:14 2004
@@ -0,0 +1,16 @@
+#!perl -wT
+
+use strict;
+
+use CGI;
+use CGI::Cookie;
+
+my %cookies = CGI::Cookie-fetch;
+my $name = 'ApacheTest';
+my $c = ! exists $cookies{$name}
+? CGI::Cookie-new(-name=$name, -value=time)
+: '';
+
+print Set-Cookie: $c\n if $c;
+print Content-Type: text/plain\n\n;
+print ($c ? 'new' : 'exists'), \n;
Modified: httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.in
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.in?view=diffrev=109277p1=httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.inr1=109276p2=httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.inr2=109277
==
--- httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.in
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/t/conf/extra.conf.inTue Nov
30 20:23:14 2004
@@ -32,3 +32,14 @@
/IfModule
+IfModule mod_cgi.c
+ ScriptAlias /cgi-bin/ @ServerRoot@/cgi-bin/
+
+ Directory @ServerRoot@/cgi-bin/
+AllowOverride None
+Options +ExecCGI
+Order allow,deny
+Allow from all
+ /Directory
+/IfModule
+
svn commit: r109387 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas
Date: Wed Dec 1 14:28:00 2004
New Revision: 109387
URL: http://svn.apache.org/viewcvs?view=revrev=109387
Log:
Tweak the handling of mp2 source build case in
Apache::TestConfig::httpd_config(), apparently mp2 source build
doesn't always know where httpd/apxs are, so we need to give a better
error message in this particular case.
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=109387p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=109386p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=109387
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Wed Dec 1 14:28:00 2004
@@ -8,6 +8,11 @@
=item 1.17-dev
+Tweak the handling of mp2 source build case in
+Apache::TestConfig::httpd_config(), apparently mp2 source build
+doesn't always know where httpd/apxs are, so we need to give a better
+error message in this particular case. [Stas]
+
Add cookie jar tests [Christopher H. Laco apache-test
chrislaco.com]
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=109387p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=109386p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=109387
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Wed Dec 1 14:28:00 2004
@@ -340,12 +340,23 @@
my $vars = $self-{vars};
unless ($vars-{httpd} or $vars-{apxs}) {
-# mod_perl 2.0 build always knows the right httpd location
-# (and optionally apxs)
-if (IS_MOD_PERL_2_BUILD) {
-# XXX: at the moment not sure what could go wrong, but it
-# shouldn't enter interactive config, which doesn't work
-# with mod_perl 2.0 build (by design)
+# mod_perl 2.0 build (almost) always knows the right httpd
+
+# location (and optionally apxs). if we get here we can't
+# continue because the interactive config can't work with
+# mod_perl 2.0 build (by design)
+if (IS_MOD_PERL_2_BUILD){
+my $mp2_build = modperl_build_config();
+# if mod_perl 2 was built against the httpd source it
+# doesn't know where to find apxs/httpd, so in this case
+# fall back to interactive config
+unless ($mp2_build-{MP_APXS}) {
+die mod_perl 2 was built against Apache sources, we .
+don't know where httpd/apxs executables are, therefore .
+skipping the test suite execution
+}
+
+# not sure what else could go wrong but we can't continue
die something is wrong, mod_perl 2.0 build should have .
supplied all the needed information to run the tests. .
Please post lib/Apache/BuildConfig.pm along with the .
svn commit: r109235 - /httpd/test/trunk/perl-framework/Apache-Test/t/redirect.t
Author: stas
Date: Tue Nov 30 11:50:03 2004
New Revision: 109235
URL: http://svn.apache.org/viewcvs?view=revrev=109235
Log:
correct the plan's need rules
Modified:
httpd/test/trunk/perl-framework/Apache-Test/t/redirect.t
Modified: httpd/test/trunk/perl-framework/Apache-Test/t/redirect.t
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/t/redirect.t?view=diffrev=109235p1=httpd/test/trunk/perl-framework/Apache-Test/t/redirect.tr1=109234p2=httpd/test/trunk/perl-framework/Apache-Test/t/redirect.tr2=109235
==
--- httpd/test/trunk/perl-framework/Apache-Test/t/redirect.t(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/t/redirect.tTue Nov 30
11:50:03 2004
@@ -4,7 +4,7 @@
use Apache::Test;
use Apache::TestRequest;
-plan tests = 6, need_module('mod_alias.c') need_lwp;
+plan tests = 6, need need_module('mod_alias.c'), need_lwp;
my $url = '/redirect';
svn commit: r106961 - /httpd/test/trunk/perl-framework/Apache-Test
Author: stas Date: Mon Nov 29 14:23:12 2004 New Revision: 106961 URL: http://svn.apache.org/viewcvs?view=revrev=106961 Log: ignore Makefile.old Modified: httpd/test/trunk/perl-framework/Apache-Test/ (props changed)
svn commit: r106733 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Author: stas Date: Sat Nov 27 08:52:42 2004 New Revision: 106733 URL: http://svn.apache.org/viewcvs?view=revrev=106733 Log: LockFile is not available to all mpms Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=106733p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=106732p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=106733 == --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Sat Nov 27 08:52:42 2004 @@ -2409,7 +2409,6 @@ PidFile @t_logs@/httpd.pid ErrorLog@t_logs@/error_log -Lockfile@t_logs@/accept.lock LogLeveldebug IfModule mod_log_config.c @@ -2429,6 +2428,7 @@ /Directory IfModule @THREAD_MODULE@ +LockFile @t_logs@/accept.lock StartServers 1 MinSpareThreads @MinClients@ MaxSpareThreads @MinClients@ @@ -2438,6 +2438,7 @@ /IfModule IfModule perchild.c +LockFile @t_logs@/accept.lock NumServers 1 StartThreads @MinClients@ MinSpareThreads @MinClients@ @@ -2447,6 +2448,7 @@ /IfModule IfModule prefork.c +LockFile @t_logs@/accept.lock StartServers @MinClients@ MinSpareServers @MinClients@ MaxSpareServers @MinClients@ @@ -2455,6 +2457,7 @@ /IfModule IfDefine APACHE1 +LockFile @t_logs@/accept.lock StartServers @MinClients@ MinSpareServers @MinClients@ MaxSpareServers @MinClients@
svn commit: r106576 - /httpd/test/trunk/perl-framework/Apache-Test/Changes /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Author: stas
Date: Thu Nov 25 06:57:40 2004
New Revision: 106576
URL: http://svn.apache.org/viewcvs?view=revrev=106576
Log:
Don't run interactive prompts when STDIN is closed
Modified:
httpd/test/trunk/perl-framework/Apache-Test/Changes
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diffrev=106576p1=httpd/test/trunk/perl-framework/Apache-Test/Changesr1=106575p2=httpd/test/trunk/perl-framework/Apache-Test/Changesr2=106576
==
--- httpd/test/trunk/perl-framework/Apache-Test/Changes (original)
+++ httpd/test/trunk/perl-framework/Apache-Test/Changes Thu Nov 25 06:57:40 2004
@@ -8,6 +8,8 @@
=item 1.17-dev
+Don't run interactive prompts when STDIN is closed [Stas]
+
Add LockFile directive in the autogenerated httpd.conf, which points
to t/logs, to handle the case where LockFile is hardcoded at compile
time to some other directory on the system. [Stas]
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diffrev=106576p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr1=106575p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pmr2=106576
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Thu Nov 25 06:57:40 2004
@@ -2090,6 +2090,11 @@
my $self = shift;
my $conf_opts = shift;
+unless (-t STDIN) {
+error STDIN is closed, can't run interactive config;
+Apache::TestRun::skip_test_suite();
+}
+
my $vars = $self-{vars};
print qq[
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm?view=diffrev=106576p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pmr1=106575p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pmr2=106576
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm Thu Nov
25 06:57:40 2004
@@ -1284,6 +1284,9 @@
sub skip_test_suite {
my $no_doubt = shift;
+# we can't prompt when there is no STDIN;
+$no_doubt = 1 unless -t STDIN;
+
print qq[
Running the test suite is important to make sure that the module that
svn commit: r106362 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm
Author: stas
Date: Tue Nov 23 16:20:51 2004
New Revision: 106362
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm
Log:
clean whitespace
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm?view=diffrev=106362p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pmr1=106361p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pmr2=106362
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestReport.pm
Tue Nov 23 16:20:51 2004
@@ -83,27 +83,27 @@
my $core_dump;
sub core_dump {
my $self = shift;
-
+
$core_dump = ;
-
+
if (eval { require Devel::GDB }) {
find(\dump_core_file, 't')
}
-
+
$core_dump || ' [CORE TRACE COMES HERE]';
}
sub dump_core_file {
return unless /^core(\.\d+)?$/;
-
+
my $core = $_;
my $gdb = new Devel::GDB ();
my $test_config = Apache::TestConfig-new({thaw=1});
my $httpd = $test_config-{vars}-{httpd};
-
+
return unless defined $httpd;
-
-$core_dump .= join '',
+
+$core_dump .= join '',
$gdb-get(file $httpd),
$gdb-get('sharedlibrary'),
$gdb-get(core $core),
svn commit: r106315 - /httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pm
Author: stas
Date: Tue Nov 23 09:05:01 2004
New Revision: 106315
Modified:
httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pm
Log:
cleanup the noise
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pm
Url:
http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pm?view=diffrev=106315p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pmr1=106314p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pmr2=106315
==
--- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pm
(original)
+++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestMM.pmTue Nov
23 09:05:01 2004
@@ -60,7 +60,6 @@
my $cover;
if (eval { require Devel::Cover }) {
-
my $atdir = File::Spec-catfile($ENV{HOME}, '.apache-test');
$cover = EOF
@@ -75,7 +74,7 @@
else {
$cover = 'EOF';
-
+
testcover :
@echo Cannot run testcover action unless Devel::Cover is installed
EOF
@@ -100,10 +99,10 @@
$(PASSENV) \
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
t/TEST $(APACHE_TEST_EXTRA_ARGS) -conf
-
+
cmodules: test_config
cd c-modules $(MAKE) all
-
+
cmodules_clean: test_config
cd c-modules $(MAKE) clean
EOF
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
stas2004/11/03 21:05:00
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
bug fix: core file incremental scan was broken
Revision ChangesPath
1.184 +6 -6
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.183
retrieving revision 1.184
diff -u -u -r1.183 -r1.184
--- TestRun.pm22 Sep 2004 23:14:29 - 1.183
+++ TestRun.pm4 Nov 2004 05:05:00 - 1.184
@@ -834,13 +834,13 @@
require IO::Dir;
my @cores = ();
for (IO::Dir-new($vars-{t_dir})-read) {
-next unless -f;
+my $file = catfile $vars-{t_dir}, $_;
+next unless -f $file;
next unless /$core_pat/o;
-my $core = catfile $vars-{t_dir}, $_;
-next if exists $core_files{$core}
-$core_files{$core} == -M $core;
-$core_files{$core} = -M $core;
-push @cores, $core;
+next if exists $core_files{$file}
+$core_files{$file} == -M $file;
+$core_files{$file} = -M $file;
+push @cores, $file;
}
return @cores
? join \n, server dumped core, for stacktrace, run:,
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/10/28 16:03:29 Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm Log: no, it takes four :( get rid of the tab Revision ChangesPath 1.254 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Index: TestConfig.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v retrieving revision 1.253 retrieving revision 1.254 diff -u -u -r1.253 -r1.254 --- TestConfig.pm 28 Oct 2004 22:59:09 - 1.253 +++ TestConfig.pm 28 Oct 2004 23:03:29 - 1.254 @@ -1818,7 +1818,7 @@ my $candidate = File::Spec-rel2abs(catfile $_, CUSTOM_CONFIG_FILE); next unless -e $candidate; # launder for -T - ($candidate) = $candidate =~ /^(.*)/; +($candidate) = $candidate =~ /^(.*)/; return $custom_config_path = $candidate; }
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/10/28 15:43:22
Modified:perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
launder the right variable: $custom_config_path, thanks geoff!
Revision ChangesPath
1.191 +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.190
retrieving revision 1.191
diff -u -u -r1.190 -r1.191
--- Changes 28 Oct 2004 14:33:55 - 1.190
+++ Changes 28 Oct 2004 22:43:22 - 1.191
@@ -8,6 +8,9 @@
=item 1.16-dev
+launder the require()d custom config filename to make -T happy
+[Torsten Förtsch torsten.foertsch gmx.net]
+
added Apache::TestRunPHP and Apache::TestConfigPHP classes,
which provide a framework for server-side testing via PHP scripts
[Geoffrey Young]
1.252 +2 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -u -r1.251 -r1.252
--- TestConfig.pm 28 Oct 2004 14:33:55 - 1.251
+++ TestConfig.pm 28 Oct 2004 22:43:22 - 1.252
@@ -2077,6 +2077,8 @@
if (my $custom_config_path = custom_config_path()) {
debug loading custom config data from: '$custom_config_path';
$custom_config_loaded++;
+# launder for -T
+($custom_config_path) = $custom_config_path = ~/^(.*)/;
require $custom_config_path;
}
else {
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/10/28 15:59:09
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
it takes three attempts to commit 1 line patch
Revision ChangesPath
1.253 +2 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -u -r1.252 -r1.253
--- TestConfig.pm 28 Oct 2004 22:43:22 - 1.252
+++ TestConfig.pm 28 Oct 2004 22:59:09 - 1.253
@@ -1817,6 +1817,8 @@
for (@inc) {
my $candidate = File::Spec-rel2abs(catfile $_, CUSTOM_CONFIG_FILE);
next unless -e $candidate;
+# launder for -T
+ ($candidate) = $candidate =~ /^(.*)/;
return $custom_config_path = $candidate;
}
@@ -2077,8 +2079,6 @@
if (my $custom_config_path = custom_config_path()) {
debug loading custom config data from: '$custom_config_path';
$custom_config_loaded++;
-# launder for -T
-($custom_config_path) = $custom_config_path = ~/^(.*)/;
require $custom_config_path;
}
else {
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRequest.pm
stas2004/10/18 15:13:35 Modified:perl-framework/Apache-Test/lib/Apache TestRequest.pm Log: doc fix Submitted by: Boris Zentner [EMAIL PROTECTED] Revision ChangesPath 1.100 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm Index: TestRequest.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm,v retrieving revision 1.99 retrieving revision 1.100 diff -u -u -r1.99 -r1.100 --- TestRequest.pm30 Sep 2004 03:32:13 - 1.99 +++ TestRequest.pm18 Oct 2004 22:13:35 - 1.100 @@ -758,7 +758,7 @@ if there is only one value and that value is not POST: # Always allow redirection. - my $redir = have_lwp ? [qw(GET HEAD POST)] : 1; + my $redir = have_lwp() ? [qw(GET HEAD POST)] : 1; Apache::TestRequest::user_agent(reset = 1, requests_redirectable = $redir);
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestHandler.pm TestRequest.pm
stas2004/09/29 20:32:13
Modified:perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestHandler.pm
TestRequest.pm
Log:
improve the same_interpreter framework to handle response failures
while trying to init and later find out the same interpreter.
Revision ChangesPath
1.172 +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.171
retrieving revision 1.172
diff -u -u -r1.171 -r1.172
--- Changes 25 Sep 2004 01:16:49 - 1.171
+++ Changes 30 Sep 2004 03:32:13 - 1.172
@@ -8,6 +8,9 @@
=item 1.14-dev
+improve the same_interpreter framework to handle response failures
+while trying to init and later find out the same interpreter. [Stas]
+
make sure that 'make distclean' cleans all the autogenerated files
[Stas]
1.5 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestHandler.pm
Index: TestHandler.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestHandler.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- TestHandler.pm8 Mar 2004 23:44:28 - 1.4
+++ TestHandler.pm30 Sep 2004 03:32:13 - 1.5
@@ -70,7 +70,7 @@
unless ($interp) {
# shouldn't be requesting this without an INTERP header
-return Apache::SERVER_ERROR;
+die can't find the interpreter key;
}
my $id = $same_interp_id;
1.99 +16 -4
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
Index: TestRequest.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -u -r1.98 -r1.99
--- TestRequest.pm31 Jul 2004 06:17:29 - 1.98
+++ TestRequest.pm30 Sep 2004 03:32:13 - 1.99
@@ -523,7 +523,11 @@
my($url) = @_;
my $res = GET($url, INTERP_KEY, 'tie');
-
+unless ($res-code == 200) {
+die sprintf failed to init the same_handler data (url=%s). .
+Failed with code=%s, response:\n%s,
+$url, $res-code, $res-content;
+}
my $same_interp = $res-header(INTERP_KEY);
return $same_interp;
@@ -535,7 +539,7 @@
sub same_interp_do {
my($same_interp, $sub, $url, @args) = @_;
-die must pass an interpreter id to work with
+die must pass an interpreter id, obtained via same_interp_tie()
unless defined $same_interp and $same_interp;
push @args, (INTERP_KEY, $same_interp);
@@ -546,9 +550,17 @@
do {
#loop until we get a response from our interpreter instance
$res = $sub-($url, @args);
-
-if ($res and $res-code == 200) {
+die no result unless $res;
+my $code = $res-code;
+if ($code == 200) {
$found_same_interp = $res-header(INTERP_KEY) || '';
+}
+elsif ($code == 404) {
+# try again
+}
+else {
+die sprintf failed to run the request (url=%s):\n .
+code=%s, response:\n%s, $url, $code, $res-content;
}
unless ($found_same_interp eq $same_interp) {
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/09/28 16:25:21 Modified:perl-framework/Apache-Test/lib/Apache Test.pm Log: explain why one needs to use need c1, c2, c3 and not c1 c2 c3 in the skip rule Revision ChangesPath 1.102 +21 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm Index: Test.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v retrieving revision 1.101 retrieving revision 1.102 diff -u -u -r1.101 -r1.102 --- Test.pm 15 Sep 2004 13:15:25 - 1.101 +++ Test.pm 28 Sep 2004 23:25:21 - 1.102 @@ -769,6 +769,27 @@ It's possible to put more than one requirement into a single hash reference, but be careful that the keys will be different. +It's also important to mention to avoid using: + + plan tests = 1, requirement1 requirement2; + +technique. While test-wise that technique is equivalent to: + + plan tests = 1, need requirement1, requirement2; + +since the test will be skipped, unless all the rules are satisfied, +it's not equivalent for the end users. The second technique, deploying +Cneed() and a list of requirements, always runs all the requirement +checks and reports all the missing requirements. In the case of the +first technique, if the first requirement fails, the second is not +run, and the missing requirement is not reported. So let's say all the +requirements are missing Apache modules, and a user wants to satisfy +all of these and run the test suite again. If all the unsatisfied +requirements are reported at once, she will need to rebuild Apache +once. If only one requirement is reported at a time, she will have to +rebuild Apache as many times as there are elements in the C +statement. + Also see plan(). =item under_construction
cvs commit: httpd-test/perl-framework/Apache-Test Makefile.PL
stas2004/09/26 21:16:22
Modified:perl-framework/Apache-Test Makefile.PL
Log:
a sub-dir Makefile.PL can't have the same function name as the top-level
Makefile.PL :(
Revision ChangesPath
1.24 +8 -11 httpd-test/perl-framework/Apache-Test/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- Makefile.PL 25 Sep 2004 01:51:03 - 1.23
+++ Makefile.PL 27 Sep 2004 04:16:22 - 1.24
@@ -41,6 +41,13 @@
Apache::TestConfig::custom_config_file_stub_write();
+my @clean_files =
+qw(lib/Apache/TestConfigData.pm
+ .mypacklist
+ t/TEST
+ Makefile.old
+ );
+
WriteMakefile(
NAME = 'Apache::Test',
VERSION = $VERSION,
@@ -49,19 +56,9 @@
COMPRESS = 'gzip -9f', SUFFIX='gz',
},
clean = {
-FILES = @{ clean_files() },
+FILES = @clean_files,
},
);
-
-sub clean_files {
-return [
-qw(lib/Apache/TestConfigData.pm
- .mypacklist
- t/TEST
- Makefile.old
- ),
- ];
-}
sub set_version {
$VERSION = $Apache::Test::VERSION;
cvs commit: httpd-test/perl-framework/Apache-Test Makefile.PL Changes
stas2004/09/24 18:16:49
Modified:perl-framework/Apache-Test Makefile.PL Changes
Log:
make sure that 'make distclean' cleans all the autogenerated files
Revision ChangesPath
1.22 +12 -0 httpd-test/perl-framework/Apache-Test/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -u -r1.21 -r1.22
--- Makefile.PL 5 Sep 2004 16:30:30 - 1.21
+++ Makefile.PL 25 Sep 2004 01:16:49 - 1.22
@@ -48,7 +48,19 @@
dist = {
COMPRESS = 'gzip -9f', SUFFIX='gz',
},
+clean = {
+FILES = @{ clean_files() },
+},
);
+
+sub clean_files {
+return [
+qw(lib/Apache/TestConfigData.pm
+ .mypacklist
+ t/TEST
+ ),
+ ];
+}
sub set_version {
$VERSION = $Apache::Test::VERSION;
1.171 +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.170
retrieving revision 1.171
diff -u -u -r1.170 -r1.171
--- Changes 23 Sep 2004 00:34:57 - 1.170
+++ Changes 25 Sep 2004 01:16:49 - 1.171
@@ -8,6 +8,9 @@
=item 1.14-dev
+make sure that 'make distclean' cleans all the autogenerated files
+[Stas]
+
make sure that if -maxclients option is passed on the command line,
minclients will never be bigger than that value [Stas]
cvs commit: httpd-test/perl-framework/Apache-Test Makefile.PL
stas2004/09/24 18:51:03 Modified:perl-framework/Apache-Test Makefile.PL Log: Makefile.old doesn't get cleaned up by MakeMaker when A-T is a sub-dir of mp2 checkout Revision ChangesPath 1.23 +1 -0 httpd-test/perl-framework/Apache-Test/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v retrieving revision 1.22 retrieving revision 1.23 diff -u -u -r1.22 -r1.23 --- Makefile.PL 25 Sep 2004 01:16:49 - 1.22 +++ Makefile.PL 25 Sep 2004 01:51:03 - 1.23 @@ -58,6 +58,7 @@ qw(lib/Apache/TestConfigData.pm .mypacklist t/TEST + Makefile.old ), ]; }
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/09/22 17:34:57
Modified:perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
make sure that if -maxclients option is passed on the command line,
minclients will never be bigger than that value
Revision ChangesPath
1.170 +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.169
retrieving revision 1.170
diff -u -u -r1.169 -r1.170
--- Changes 22 Sep 2004 23:14:29 - 1.169
+++ Changes 23 Sep 2004 00:34:57 - 1.170
@@ -8,6 +8,9 @@
=item 1.14-dev
+make sure that if -maxclients option is passed on the command line,
+minclients will never be bigger than that value [Stas]
+
add -one-process runtime argument, which will start the server
in single-server mode (httpd -X in Apache 1.X or
httpd -D ONE_PROCESS in 2.X) [Geoffrey Young]
1.248 +20 -7
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -u -r1.247 -r1.248
--- TestConfig.pm 21 Sep 2004 23:47:13 - 1.247
+++ TestConfig.pm 23 Sep 2004 00:34:57 - 1.248
@@ -299,15 +299,24 @@
$vars-{serveradmin} ||= $self-default_serveradmin;
$vars-{minclients} ||= 1;
-my $maxclientspreset = $vars-{maxclients} || 0;
+$vars-{maxclients_preset} = $vars-{maxclients} || 0;
+# if maxclients wasn't explicitly passed try to
# prevent 'server reached MaxClients setting' errors
$vars-{maxclients} ||= $vars-{minclients} + 1;
+
+# if a preset maxclients valus is smaller than minclients,
+# maxclients overrides minclients
+if ($vars-{maxclients_preset}
+$vars-{maxclients_preset} $vars-{minclients}) {
+$vars-{minclients} = $vars-{maxclients_preset};
+}
+
# for threaded mpms MaxClients must be a multiple of
# ThreadsPerChild (i.e. maxclients % minclients == 0)
# so unless -maxclients was explicitly specified use a double of
# minclients
-$vars-{maxclientsthreadedmpm} =
-$maxclientspreset || $vars-{minclients} * 2;
+$vars-{maxclientsthreadedmpm} =
+$vars-{maxclients_preset} || $vars-{minclients} * 2;
$vars-{proxy}||= 'off';
$vars-{proxyssl_url} ||= '';
@@ -481,8 +490,10 @@
#if we proxy to ourselves, must bump the maxclients
if ($vars-{proxy} =~ /^on$/i) {
-$vars-{minclients}++;
-$vars-{maxclients}++;
+unless ($vars-{maxclients_preset}) {
+$vars-{minclients}++;
+$vars-{maxclients}++;
+}
$vars-{proxy} = $self-{vhosts}-{'mod_proxy'}-{hostport};
return $vars-{proxy};
}
@@ -1277,8 +1288,10 @@
}
if ($vars-{proxyssl_url}) {
-$vars-{minclients}++;
-$vars-{maxclients}++;
+unless ($vars-{maxclients_preset}) {
+$vars-{minclients}++;
+$vars-{maxclients}++;
+}
}
}
}
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/09/21 16:47:13
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
-T disallows any relative directories in the PATH, not only .. besides
the previous cleanup pattern was not so good, which was my fault :)
Revision ChangesPath
1.247 +3 -3
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -u -r1.246 -r1.247
--- TestConfig.pm 21 Sep 2004 05:39:23 - 1.246
+++ TestConfig.pm 21 Sep 2004 23:47:13 - 1.247
@@ -1017,9 +1017,9 @@
# Temporarly untaint PATH
(local $ENV{PATH}) = ( $ENV{PATH} =~ /(.*)/ );
-# -T doesn't like . in the PATH
-$ENV{PATH} =~ s#(^|:)\.[/\\]?(:|$)##;
-
+# -T disallows relative directories in the PATH
+$ENV{PATH} = join ':', grep !/^\./, split /:/, $ENV{PATH};
+
my $handle = Symbol::gensym();
open $handle, $cmd| or die $cmd failed: $!;
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/09/17 11:24:14
Modified:perl-framework/Apache-Test/lib/Apache TestHarness.pm
perl-framework/Apache-Test Changes
Log:
Allow / \ and \\ path delimiters in SKIP file
Submitted by: Markus Wichitill [EMAIL PROTECTED]
Revision ChangesPath
1.20 +3 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestHarness.pm
Index: TestHarness.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestHarness.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- TestHarness.pm9 Aug 2004 13:26:10 - 1.19
+++ TestHarness.pm17 Sep 2004 18:24:13 - 1.20
@@ -167,6 +167,9 @@
@tests = $self-prune(@tests);
if (my $skip = $self-skip) {
+# Allow / \ and \\ path delimiters in SKIP file
+$skip =~ s![/]+![/]!g;
+
@tests = grep { not /(?:$skip)/ } @tests;
}
1.167 +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.166
retrieving revision 1.167
diff -u -u -r1.166 -r1.167
--- Changes 16 Sep 2004 21:36:13 - 1.166
+++ Changes 17 Sep 2004 18:24:14 - 1.167
@@ -8,6 +8,9 @@
=item 1.14-dev
+Allow / \ and \\ path delimiters in SKIP file [Markus Wichitill
+[EMAIL PROTECTED]]
+
Added an apxs query cache for improved test performance [Gozer]
run_tests make target no longer invokes t/TEST -clean, making it
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/09/05 09:30:30
Modified:perl-framework/Apache-Test Changes Makefile.PL
perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
don't allow running an explicit 'perl Makefile.PL', when Apache-Test
is checked out into the modperl-2.0 tree, since it then decides that
it's a part of the modperl-2.0 build and will try to use modperl
httpd/apxs arguments which could be unset or wrong
Revision ChangesPath
1.163 +4 -4 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -u -r1.162 -r1.163
--- Changes 5 Sep 2004 00:11:30 - 1.162
+++ Changes 5 Sep 2004 16:30:29 - 1.163
@@ -11,10 +11,10 @@
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
-the tests). [Stas]
+don't allow running an explicit 'perl Makefile.PL', when Apache-Test
+is checked out into the modperl-2.0 tree, since it then decides that
+it's a part of the modperl-2.0 build and will try to use modperl
+httpd/apxs arguments which could be unset or wrong [Stas]
Fix skip test suite functionality in the interactive configuration
phase [Stas]
1.21 +19 -1 httpd-test/perl-framework/Apache-Test/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- Makefile.PL 6 Aug 2004 18:20:41 - 1.20
+++ Makefile.PL 5 Sep 2004 16:30:30 - 1.21
@@ -15,8 +15,13 @@
use Apache::TestMM qw(test clean); #enable 'make test and make clean'
use Apache::TestRun;
+use Apache::TestTrace;
+use Apache::TestConfig ();
my $VERSION;
+set_version();
+
+sanity_check();
Apache::TestMM::filter_args();
@@ -26,7 +31,6 @@
Apache::TestMM::generate_script($_);
}
-set_version();
# if built with mod_perl 2.0, its top-level Makefile.PL already
# installs the uninstall code
@@ -60,6 +64,20 @@
}
close $fh;
+}
+
+sub sanity_check {
+# don't allow running an explicit 'perl Makefile.PL', when
+# Apache-Test is checked out into the modperl-2.0 tree, since
+# it then decides that it's a part of the modperl-2.0 build and
+# will try to use modperl httpd/apxs arguments which could be
+# unset or wrong
+if (TOP_LEVEL -e ../lib/mod_perl.pm) {
+error Do not run 'perl Makefile.PL' when Apache-Test is a .
+subdirectory of modperl-2.0. Copy it elsewhere and run .
+from there.;
+Apache::TestRun::exit_perl(0);
+}
}
sub MY::postamble {
1.244 +3 -4
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -u -r1.243 -r1.244
--- TestConfig.pm 27 Aug 2004 01:03:55 - 1.243
+++ TestConfig.pm 5 Sep 2004 16:30:30 - 1.244
@@ -30,12 +30,11 @@
use constant IS_MOD_PERL_2 =
eval { require mod_perl $mod_perl::VERSION = 1.99 } || 0;
+use constant IS_MOD_PERL_2_BUILD = IS_MOD_PERL_2
+require Apache::Build Apache::Build::IS_MOD_PERL_BUILD();
+
use constant IS_APACHE_TEST_BUILD =
grep { -e $_/lib/Apache/TestConfig.pm } qw(Apache-Test . ..);
-
-use constant IS_MOD_PERL_2_BUILD =
-IS_MOD_PERL_2 !IS_APACHE_TEST_BUILD
-require Apache::Build Apache::Build::IS_MOD_PERL_BUILD();
use constant CUSTOM_CONFIG_FILE = 'Apache/TestConfigData.pm';
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
stas2004/08/28 08:05:32
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
use 'or die' to avoid warnings due to possible overrides of die
(better than calling CORE::die)
Revision ChangesPath
1.181 +4 -6
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.180
retrieving revision 1.181
diff -u -u -r1.180 -r1.181
--- TestRun.pm26 Aug 2004 01:17:58 - 1.180
+++ TestRun.pm28 Aug 2004 15:05:32 - 1.181
@@ -639,9 +639,8 @@
$orig_command = ulimit -c unlimited; $orig_command;
warning setting ulimit to allow core files\n$orig_command;
-exec $orig_command;
-# use CORE::die to avoid warnings due to possible overrides of die
-CORE::die exec $orig_command has failed; # shouldn't be reached
+# use 'or die' to avoid warnings due to possible overrides of die
+exec $orig_command or die exec $orig_command has failed;
}
sub set_ulimit {
@@ -744,9 +743,8 @@
$orig_cwd ||= Cwd::cwd();
chdir $orig_cwd;
warning rerunning '$orig_command' with new config opts;
-exec $orig_command;
-# use CORE::die to avoid warnings due to possible overrides of die
-CORE::die exec $orig_command has failed; # shouldn't be reached
+# use 'or die' to avoid warnings due to possible overrides of die
+exec $orig_command or die exec $orig_command has failed;
}
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/08/26 17:51:55
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
perl-framework/Apache-Test Changes
Log:
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
the tests).
Revision ChangesPath
1.242 +18 -5
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -u -r1.241 -r1.242
--- TestConfig.pm 26 Aug 2004 23:58:58 - 1.241
+++ TestConfig.pm 27 Aug 2004 00:51:54 - 1.242
@@ -30,12 +30,13 @@
use constant IS_MOD_PERL_2 =
eval { require mod_perl $mod_perl::VERSION = 1.99 } || 0;
-use constant IS_MOD_PERL_2_BUILD = IS_MOD_PERL_2
-require Apache::Build Apache::Build::IS_MOD_PERL_BUILD();
-
use constant IS_APACHE_TEST_BUILD =
grep { -e $_/lib/Apache/TestConfig.pm } qw(Apache-Test . ..);
+use constant IS_MOD_PERL_2_BUILD =
+IS_MOD_PERL_2 !IS_APACHE_TEST_BUILD
+require Apache::Build Apache::Build::IS_MOD_PERL_BUILD();
+
use constant CUSTOM_CONFIG_FILE = 'Apache/TestConfigData.pm';
use File::Copy ();
@@ -325,12 +326,24 @@
sub httpd_config {
my $self = shift;
-my $vars = $self-{vars};
-
$self-configure_apxs;
$self-configure_httpd;
+my $vars = $self-{vars};
unless ($vars-{httpd} or $vars-{apxs}) {
+
+# mod_perl 2.0 build always knows the right httpd location
+# (and optionally apxs)
+if (IS_MOD_PERL_2_BUILD) {
+# XXX: at the moment not sure what could go wrong, but it
+# shouldn't enter interactive config, which doesn't work
+# with mod_perl 2.0 build (by design)
+die something is wrong, mod_perl 2.0 build should have .
+supplied all the needed information to run the tests. .
+Please post lib/Apache/BuildConfig.pm along with the .
+bug report;
+}
+
if ($ENV{APACHE_TEST_NO_STICKY_PREFERENCES}) {
error You specified APACHE_TEST_NO_STICKY_PREFERENCES=1 .
in which case you must explicitly specify -httpd .
1.161 +5 -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.160
retrieving revision 1.161
diff -u -u -r1.160 -r1.161
--- Changes 26 Aug 2004 23:58:58 - 1.160
+++ Changes 27 Aug 2004 00:51:55 - 1.161
@@ -8,6 +8,11 @@
=item 1.14-dev
+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
+the tests). [Stas]
+
Fix skip test suite functionality in the interactive configuration
phase [Stas]
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/08/26 18:03:55
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
a bug to fix
Revision ChangesPath
1.243 +1 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -u -r1.242 -r1.243
--- TestConfig.pm 27 Aug 2004 00:51:54 - 1.242
+++ TestConfig.pm 27 Aug 2004 01:03:55 - 1.243
@@ -1745,6 +1745,7 @@
# httpd opts
my $test_config = Apache::TestConfig-new({thaw=1});
+# XXX: need to run httpd config to get the value of httpd
if (my $httpd = $test_config-{vars}-{httpd}) {
$httpd = shell_ready($httpd);
$command = $httpd -V;
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/08/20 11:18:41 Modified:perl-framework/Apache-Test Changes Log: 1.13 release Revision ChangesPath 1.157 +1 -1 httpd-test/perl-framework/Apache-Test/Changes Index: Changes === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v retrieving revision 1.156 retrieving revision 1.157 diff -u -u -r1.156 -r1.157 --- Changes 6 Aug 2004 18:20:41 - 1.156 +++ Changes 20 Aug 2004 18:18:41 - 1.157 @@ -6,7 +6,7 @@ =over 3 -=item 1.13-dev +=item 1.13 - Aug 20, 2004 move the custom config code into Apache::TestConfig, split the config object creation in 2 parts - first not requiring the knowledge of
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/08/20 11:25:53 Modified:perl-framework/Apache-Test Changes RELEASE perl-framework/Apache-Test/lib/Apache Test.pm Log: start the 1.14 dev cycle Revision ChangesPath 1.158 +6 -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.157 retrieving revision 1.158 diff -u -u -r1.157 -r1.158 --- Changes 20 Aug 2004 18:18:41 - 1.157 +++ Changes 20 Aug 2004 18:25:53 - 1.158 @@ -6,6 +6,12 @@ =over 3 +=item 1.14-dev + + + + + =item 1.13 - Aug 20, 2004 move the custom config code into Apache::TestConfig, split the config 1.12 +3 -3 httpd-test/perl-framework/Apache-Test/RELEASE Index: RELEASE === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/RELEASE,v retrieving revision 1.11 retrieving revision 1.12 diff -u -u -r1.11 -r1.12 --- RELEASE 28 Jun 2004 16:53:34 - 1.11 +++ RELEASE 20 Aug 2004 18:25:53 - 1.12 @@ -47,7 +47,7 @@ 5. Announce the package a. post ... to the modperl, announce lists - Subject: [ANNOUNCE] Apache-Test 1.13 + Subject: [ANNOUNCE] Apache-Test 1.14 include - MD5 sig (as it comes from CPAN upload announce). - the latest Changes @@ -59,13 +59,13 @@ b. edit ./Changes: - start a new item with incremented version + '-dev' - =item 1.14-dev + =item 1.15-dev c. bump up version numbers in this file to make it easier to do the next release. + perl -pi -e 's/\.15/.16/g' RELEASE perl -pi -e 's/\.14/.15/g' RELEASE - perl -pi -e 's/\.13/.14/g' RELEASE now reload this file and bump up the last number of the first command. 1.100 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm Index: Test.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v retrieving revision 1.99 retrieving revision 1.100 diff -u -u -r1.99 -r1.100 --- Test.pm 19 Aug 2004 03:09:46 - 1.99 +++ Test.pm 20 Aug 2004 18:25:53 - 1.100 @@ -41,7 +41,7 @@ %EXPORT_TAGS = (withtestmore = [EMAIL PROTECTED]); -$VERSION = '1.13'; +$VERSION = '1.14'; %SubTests = (); @SkipReasons = ();
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/08/15 16:19:57
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
something to be done
Revision ChangesPath
1.239 +2 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -u -r1.238 -r1.239
--- TestConfig.pm 15 Aug 2004 23:11:29 - 1.238
+++ TestConfig.pm 15 Aug 2004 23:19:57 - 1.239
@@ -1370,7 +1370,8 @@
my $self = shift;
# XXX: httpd config is required, for now just skip ssl clean if
-# there is none
+# there is none. should probably add some flag which will tell us
+# when httpd_config was already run
return unless $self-{vars}-{httpd} $self-{vars}-{ssl_module};
return unless $self-sslca_can;
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/08/11 01:20:54 Modified:perl-framework/Apache-Test/lib/Apache Test.pm Log: document the newly added wrapper Revision ChangesPath 1.98 +9 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm Index: Test.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v retrieving revision 1.97 retrieving revision 1.98 diff -u -u -r1.97 -r1.98 --- Test.pm 9 Aug 2004 06:22:06 - 1.97 +++ Test.pm 11 Aug 2004 08:20:54 - 1.98 @@ -789,6 +789,15 @@ =head1 Additional Configuration Variables +=item basic_config + + my $basic_cfg = Apache::Test::basic_config(); + $basic_cfg-write_perlscript($file, $content); + +Cbasic_config() is similar to Cconfig(), but doesn't contain any +httpd-specific information and should be used for operations that +don't require any httpd-specific knowledge. + =item config my $cfg = Apache::Test::config();
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/08/11 11:42:56
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
skip ssl cleanup if there is httpd config
Revision ChangesPath
1.237 +4 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -u -r1.236 -r1.237
--- TestConfig.pm 11 Aug 2004 08:42:36 - 1.236
+++ TestConfig.pm 11 Aug 2004 18:42:56 - 1.237
@@ -1369,6 +1369,10 @@
sub sslca_clean {
my $self = shift;
+# XXX: httpd config is required, for now just skip ssl clean if
+# there is none
+return unless $self-{vars}-{httpd};
+
return unless $self-sslca_can;
Apache::TestSSLCA::clean($self);
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/08/08 23:22:06
Modified:perl-framework/Apache-Test/lib/Apache Test.pm
Log:
fix the basic_config cache
Revision ChangesPath
1.97 +4 -2 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
Index: Test.pm
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -u -r1.96 -r1.97
--- Test.pm 9 Aug 2004 06:19:15 - 1.96
+++ Test.pm 9 Aug 2004 06:22:06 - 1.97
@@ -57,9 +57,11 @@
$Config ||= Apache::TestConfig-thaw-httpd_config;
}
-# doesn't require httpd to be found
+my $Basic_config;
+
+# config bits which doesn't require httpd to be found
sub basic_config {
-$Config ||= Apache::TestConfig-thaw();
+$Basic_config ||= Apache::TestConfig-thaw();
}
sub vars {
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
stas2004/08/09 13:50:14
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
split exit_opts into those that need to know about httpd and those that
don't. run those at the appropriate timing. so now -debug and -ping should
work again
Revision ChangesPath
1.178 +9 -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.177
retrieving revision 1.178
diff -u -u -r1.177 -r1.178
--- TestRun.pm9 Aug 2004 06:19:15 - 1.177
+++ TestRun.pm9 Aug 2004 20:50:14 - 1.178
@@ -56,10 +56,12 @@
my @num_opts = qw(times);
my @list_opts= qw(preamble postamble breakpoint);
my @hash_opts= qw(header);
-my @help_opts= qw(clean help ping);
-my @exit_opts= (@help_opts, @debug_opts);
+my @help_opts= qw(clean help);
my @request_opts = qw(get post head);
+my @exit_opts_no_need_httpd = (@help_opts);
+my @exit_opts_need_httpd= (@debug_opts, qw(ping));
+
my %usage = (
'start-httpd' = 'start the test server',
'run-tests' = 'run the tests',
@@ -508,8 +510,9 @@
sub try_exit_opts {
my $self = shift;
+my @opts = @_;
-for (@exit_opts) {
+for (@opts) {
next unless exists $self-{opts}-{$_};
my $method = opt_$_;
my $rc = $self-$method();
@@ -693,10 +696,12 @@
local($SIG{__DIE__}, $SIG{INT});
$self-install_sighandlers;
-$self-try_exit_opts;
+$self-try_exit_opts(@exit_opts_no_need_httpd);
# httpd is found here (unless it was already configured before)
$self-{test_config}-httpd_config();
+
+$self-try_exit_opts(@exit_opts_need_httpd);
if ($self-{opts}-{configure}) {
warning cleaning out current configuration;
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/08/06 19:21:47
Modified:perl-framework/Apache-Test/lib/Apache Test.pm
Log:
explain the reason for no warnings qw(numeric);
Revision ChangesPath
1.94 +2 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
Index: Test.pm
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -u -r1.93 -r1.94
--- Test.pm 7 Aug 2004 02:14:11 - 1.93
+++ Test.pm 7 Aug 2004 02:21:47 - 1.94
@@ -257,8 +257,9 @@
# need_module requires the perl module
return 0 unless need_module($module);
+# support dev versions like 0.18_01
return 1
-if eval { no warnings qw(numeric); $module-VERSION($version) };
+if eval { no warnings qw(numeric); $module-VERSION($version) };
push @SkipReasons, $module version $version or higher is required;
return 0;
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm TestBuild.pm TestConfig.pm TestMB.pm TestMM.pm TestReport.pm TestRun.pm TestSmoke.pm
stas2004/08/06 19:56:27
Modified:perl-framework/Apache-Test/lib/Apache Test.pm TestBuild.pm
TestConfig.pm TestMB.pm TestMM.pm TestReport.pm
TestRun.pm TestSmoke.pm
Log:
add basic_config wrapper, which gets the config object w/o trying to find
httpd (otherwise interactive config was popping up at 'perl Makefile.PL'
phase, which is too early
Revision ChangesPath
1.95 +5 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
Index: Test.pm
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -u -r1.94 -r1.95
--- Test.pm 7 Aug 2004 02:21:47 - 1.94
+++ Test.pm 7 Aug 2004 02:56:26 - 1.95
@@ -57,6 +57,11 @@
$Config ||= Apache::TestConfig-thaw;
}
+# doesn't require httpd to be found
+sub basic_config {
+$Config ||= Apache::TestConfig-thaw(no_httpd_config = 1);
+}
+
sub vars {
@_ ? @{ config()-{vars} }{ @_ } : config()-{vars};
}
1.5 +1 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestBuild.pm
Index: TestBuild.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestBuild.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- TestBuild.pm 4 Mar 2004 05:51:31 - 1.4
+++ TestBuild.pm 7 Aug 2004 02:56:26 - 1.5
@@ -604,7 +604,7 @@
my $content = join '', DATA;
-Apache::Test::config()-write_perlscript($file, $content);
+Apache::Test::basic_config()-write_perlscript($file, $content);
}
unless (caller) {
1.234 +3 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -u -r1.233 -r1.234
--- TestConfig.pm 6 Aug 2004 21:43:22 - 1.233
+++ TestConfig.pm 7 Aug 2004 02:56:26 - 1.234
@@ -193,8 +193,10 @@
# httpd-independent components
my $self = $class-new_common(@_);
+my $vars = $self-{vars};
+
# components requiring httpd knowledge
-$self-httpd_config;
+$self-httpd_config unless $vars-{no_httpd_config};
$self;
}
1.6 +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.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- TestMB.pm 9 Jul 2004 20:01:26 - 1.5
+++ TestMB.pm 7 Aug 2004 02:56:26 - 1.6
@@ -136,7 +136,7 @@
# Make it so!
print Generating test running script $script\n if $self-verbose;
-Apache::Test::config()-write_perlscript($script, $body);
+Apache::Test::basic_config()-write_perlscript($script, $body);
$self-add_to_cleanup($self-apache_test_script);
}
1.36 +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.35
retrieving revision 1.36
diff -u -u -r1.35 -r1.36
--- TestMM.pm 28 Jul 2004 21:58:53 - 1.35
+++ TestMM.pm 7 Aug 2004 02:56:26 - 1.36
@@ -105,7 +105,7 @@
close $in;
info generating script $file;
-Apache::Test::config()-write_perlscript($file, $body);
+Apache::Test::basic_config()-write_perlscript($file, $body);
}
sub filter_args {
1.13 +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.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- TestReport.pm 4 Mar 2004 05:51:31 - 1.12
+++ TestReport.pm 7 Aug 2004 02:56:26 - 1.13
@@ -41,7 +41,7 @@
use $class;,
$class-new([EMAIL PROTECTED])-run;;
-Apache::Test::config()-write_perlscript($file, $content);
+Apache::Test::basic_config()-write_perlscript($file, $content);
}
sub replace {
1.176 +4 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigPerl.pm TestRun.pm TestServer.pm
stas2004/08/06 11:20:42
Modified:perl-framework/Apache-Test Changes Makefile.PL
perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestConfigPerl.pm TestRun.pm TestServer.pm
Log:
move the custom config code into Apache::TestConfig, split the config
object creation in 2 parts - first not requiring the knowledge of
httpd location, the second requiring one, refactor the custom config
interactive prompting into the second phase, if failed to find
httpd. Reshuffle the code to run first bits not requiring the
knowledge of httpd location.
Revision ChangesPath
1.156 +7 -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.155
retrieving revision 1.156
diff -u -u -r1.155 -r1.156
--- Changes 5 Aug 2004 07:00:10 - 1.155
+++ Changes 6 Aug 2004 18:20:41 - 1.156
@@ -8,6 +8,13 @@
=item 1.13-dev
+move the custom config code into Apache::TestConfig, split the config
+object creation in 2 parts - first not requiring the knowledge of
+httpd location, the second requiring one, refactor the custom config
+interactive prompting into the second phase, if failed to find
+httpd. Reshuffle the code to run first bits not requiring the
+knowledge of httpd location. [Stas]
+
fix Apache::TestCommonPost::lwp_do to work with LWP 5.800
($res-content() doesn't allow CODE refs anymore, instead used
content_ref to avoid huge strings copy) [Stas]
1.20 +1 -1 httpd-test/perl-framework/Apache-Test/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- Makefile.PL 18 Feb 2004 20:24:44 - 1.19
+++ Makefile.PL 6 Aug 2004 18:20:41 - 1.20
@@ -35,7 +35,7 @@
add_Apache__test_target();
}
-Apache::TestRun::custom_config_file_stub_write();
+Apache::TestConfig::custom_config_file_stub_write();
WriteMakefile(
NAME = 'Apache::Test',
1.231 +512 -10
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -u -r1.230 -r1.231
--- TestConfig.pm 4 Aug 2004 15:29:53 - 1.230
+++ TestConfig.pm 6 Aug 2004 18:20:41 - 1.231
@@ -36,7 +36,8 @@
use constant IS_APACHE_TEST_BUILD =
grep { -e $_/lib/Apache/TestConfig.pm } qw(Apache-Test . ..);
-use Symbol ();
+use constant CUSTOM_CONFIG_FILE = 'Apache/TestConfigData.pm';
+
use File::Copy ();
use File::Find qw(finddepth);
use File::Basename qw(dirname);
@@ -44,16 +45,29 @@
use File::Spec::Functions qw(catfile abs2rel splitdir canonpath
catdir file_name_is_absolute devnull);
use Cwd qw(fastcwd);
+use Socket ();
+use Symbol ();
use Apache::TestConfigPerl ();
use Apache::TestConfigParse ();
use Apache::TestTrace;
use Apache::TestServer ();
use Apache::TestRun ();
-use Socket ();
use vars qw(%Usage);
+# variables stored in $Apache::TestConfigData::vars
+my @data_vars_must = qw(httpd apxs);
+my @data_vars_opt = qw(user group port);
+# mapping from $Apache::TestConfigData::vars to $ENV settings
+my %vars_to_env = (
+httpd = 'APACHE_TEST_HTTPD',
+apxs = 'APACHE_TEST_APXS',
+user = 'APACHE_TEST_USER',
+group = 'APACHE_TEST_GROUP',
+port = 'APACHE_TEST_PORT',
+);
+
%Usage = (
top_dir = 'top-level directory (default is $PWD)',
t_dir = 'the t/ test directory (default is $top_dir/t)',
@@ -220,7 +234,7 @@
# custom config options from Apache::TestConfigData
# again, this should force reconfiguration
-Apache::TestRun::custom_config_add_conf_opts($args);
+custom_config_add_conf_opts($args);
my $self = bless {
clean = {},
@@ -296,11 +310,6 @@
$vars-{proxyssl_url} ||= '';
$vars-{defines} ||= '';
-$self-configure_apxs;
-$self-configure_httpd;
-$self-inherit_config; #see TestConfigParse.pm
-$self-configure_httpd_eapi; #must come after inherit_config
-
$self-default_module(cgi= [qw(mod_cgi mod_cgid)]);
$self-default_module(thread = [qw(worker threaded)]);
$self-default_module(ssl= [qw(mod_ssl)]);
@@ -309,9 +318,48 @@
$self-default_module(php= [qw(mod_php4 mod_php5)]);
$self
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm TestConfig.pm TestRun.pm
stas2004/08/06 14:43:23
Modified:perl-framework/Apache-Test/lib/Apache Test.pm TestConfig.pm
TestRun.pm
Log:
better split of the Apache::TestConfig-new in two parts
Revision ChangesPath
1.92 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
Index: Test.pm
===
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -u -r1.91 -r1.92
--- Test.pm 6 Aug 2004 19:31:21 - 1.91
+++ Test.pm 6 Aug 2004 21:43:22 - 1.92
@@ -54,7 +54,7 @@
my $Config;
sub config {
-$Config ||= Apache::TestConfig-thaw-complete_config;
+$Config ||= Apache::TestConfig-thaw;
}
sub vars {
1.233 +15 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -u -r1.232 -r1.233
--- TestConfig.pm 6 Aug 2004 19:31:21 - 1.232
+++ TestConfig.pm 6 Aug 2004 21:43:22 - 1.233
@@ -189,6 +189,20 @@
sub new {
my $class = shift;
+
+# httpd-independent components
+my $self = $class-new_common(@_);
+
+# components requiring httpd knowledge
+$self-httpd_config;
+
+$self;
+}
+
+# setup httpd-independent components
+sub new_common {
+my $class = shift;
+
my $args;
$args = shift if $_[0] and ref $_[0];
@@ -326,7 +340,7 @@
# figure out where httpd is and run extra config hooks which require
# knowledge of where httpd is
-sub complete_config {
+sub httpd_config {
my $self = shift;
my $vars = $self-{vars};
1.175 +5 -3
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.174
retrieving revision 1.175
diff -u -u -r1.174 -r1.175
--- TestRun.pm6 Aug 2004 18:20:42 - 1.174
+++ TestRun.pm6 Aug 2004 21:43:22 - 1.175
@@ -395,7 +395,7 @@
my $self = shift;
$self-opt_clean(1);
$self-{conf_opts}-{save} = delete $self-{conf_opts}-{thaw} || 1;
-$self-{test_config} = $self-new_test_config()-complete_config;
+$self-{test_config} = $self-new_test_config();
$self-{server} = $self-{test_config}-server;
}
@@ -683,7 +683,9 @@
$self-pre_configure();
-$self-{test_config} = $self-new_test_config();
+# can't setup the httpd-specific parts of the config object yet
+$self-{test_config} =
+Apache::TestConfig-new_common($self-{conf_opts});
$self-warn_core();
@@ -695,7 +697,7 @@
$self-try_exit_opts;
# httpd is found here (unless it was already configured before)
-$self-{test_config}-complete_config;
+$self-{test_config}-httpd_config;
if ($self-{opts}-{configure}) {
warning cleaning out current configuration;
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRunPerl.pm
stas2004/08/05 12:08:26
Modified:perl-framework/Apache-Test/lib/Apache TestRunPerl.pm
Log:
version string already contains 'Apache/' prefix
Revision ChangesPath
1.19 +1 -1
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.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- TestRunPerl.pm31 Mar 2004 08:35:48 - 1.18
+++ TestRunPerl.pm5 Aug 2004 19:08:25 - 1.19
@@ -59,7 +59,7 @@
if (($rev == 1 and $mod_perl::VERSION = 1.99) ||
($rev == 2 and $mod_perl::VERSION 1.99)) {
error Found mod_perl/$mod_perl::VERSION, .
-but it can't be used with Apache/$ver;
+but it can't be used with $ver;
Apache::TestRun::exit_perl(0);
}
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestUtil.pm
stas2004/07/12 12:03:57 Modified:perl-framework/Apache-Test/lib/Apache TestUtil.pm Log: restore the order the debug tracing is done, expected followed by actual Revision ChangesPath 1.41 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm Index: TestUtil.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -u -u -r1.40 -r1.41 --- TestUtil.pm 10 Jun 2004 13:14:36 - 1.40 +++ TestUtil.pm 12 Jul 2004 19:03:57 - 1.41 @@ -123,8 +123,8 @@ } t_debug(testing : . pop) if @_ == 3; -t_debug(received: . struct_as_string(0, $received)); t_debug(expected: . struct_as_string(0, $expected)); +t_debug(received: . struct_as_string(0, $received)); return t_is_equal($received, $expected); }
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestMB.pm
stas2004/07/06 00:56:12
Modified:perl-framework/Apache-Test/lib/Apache TestMB.pm
Log:
use generate_script sub name
Submitted by: David Wheeler
Revision ChangesPath
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- TestMB.pm 24 Jun 2004 13:23:06 - 1.2
+++ TestMB.pm 6 Jul 2004 07:56:12 - 1.3
@@ -15,7 +15,7 @@
my $self = $pkg-SUPER::new(@_);
$self-{properties}{apache_test_args} = $vars;
$self-{properties}{apache_test_script} ||= 't/TEST';
-$self-generate_test_script;
+$self-generate_script;
return $self;
}
@@ -92,7 +92,7 @@
sub ACTION_cmodules_clean { shift-_cmodues('clean') }
# XXX I'd love to make this optional.
-sub generate_test_script {
+sub generate_script {
my $self = shift;
# If a file name has been passed in, use it. Otherwise, use the
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/06/27 11:46:03
Modified:perl-framework/Apache-Test/lib/Apache TestReportPerl.pm
perl-framework/Apache-Test Changes
Log:
Force projects that use Apache::TestReportPerl to implement
report_to() if they use t/REPORT in their projects.
Revision ChangesPath
1.7 +6 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestReportPerl.pm
Index: TestReportPerl.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestReportPerl.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- TestReportPerl.pm 4 Mar 2004 05:51:31 - 1.6
+++ TestReportPerl.pm 27 Jun 2004 18:46:03 - 1.7
@@ -28,7 +28,12 @@
ModPerl::Config::as_string();
}
-sub report_to { 'dev@perl.apache.org' }
+sub report_to {
+my $self = shift;
+my $pkg = ref $self;
+die you need to implement $pkg\::report_to() to return the .
+contact email address of your project;
+}
1;
__END__
1.142 +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.141
retrieving revision 1.142
diff -u -u -r1.141 -r1.142
--- Changes 27 Jun 2004 18:38:57 - 1.141
+++ Changes 27 Jun 2004 18:46:03 - 1.142
@@ -8,6 +8,9 @@
=item 1.12-dev
+Force projects that use Apache::TestReportPerl to implement
+report_to() if they use t/REPORT in their projects. [Stas]
+
Add redirect tests [David Wheeler [EMAIL PROTECTED]]
add -no-httpd runtime option to allow tests to run without configuring,
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/06/23 08:51:16
Modified:perl-framework/Apache-Test Changes
Added: perl-framework/Apache-Test/lib/Apache TestMB.pm
Log:
Add support for Module::Build, with a new module: Apache::TestMB (a
clone of Apache::TestMM for ExtUtils::MakeMaker).
Submitted by: David Wheeler [EMAIL PROTECTED]
Revision ChangesPath
1.1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestMB.pm
Index: TestMB.pm
===
package Apache::TestMB;
use strict;
use vars qw(@ISA);
use Module::Build;
use Apache::Test ();
use Apache::TestConfig ();
@ISA = qw(Module::Build);
sub new {
my $pkg = shift;
my($argv, $vars) =
Apache::TestConfig::filter_args([EMAIL PROTECTED],
\%Apache::TestConfig::Usage);
@ARGV = @$argv;
my $self = $pkg-SUPER::new(@_);
$self-{properties}{apache_test_args} = $vars;
$self-{properties}{apache_test_script} ||= 't/TEST';
$self-generate_test_script;
return $self;
}
sub valid_property {
return 1 if defined $_[1]
($_[1] eq 'apache_test_args' || $_[1] eq 'apache_test_script');
shift-SUPER::valid_property(@_);
}
sub apache_test_args {
my $self = shift;
$self-{properties}{apache_test_args} = shift if @_;
return $self-{properties}{apache_test_args};
}
sub apache_test_script {
my $self = shift;
$self-{properties}{apache_test_script} = shift if @_;
return $self-{properties}{apache_test_script};
}
sub ACTION_test_clean {
my $self = shift;
# XXX I'd love to do this without t/TEST.
$self-do_system( $self-perl, $self-_bliblib,
$self-localize_file_path($self-apache_test_script),
'-clean');
}
sub ACTION_clean {
my $self = shift;
$self-depends_on('test_clean');
$self-SUPER::ACTION_clean(@_);
}
sub ACTION_run_tests {
my $self = shift;
$self-depends_on('test_clean');
# XXX I'd love to do this without t/TEST.
$self-do_system($self-perl, $self-_bliblib,
$self-localize_file_path($self-apache_test_script),
'-bugreport', '-verbose=' . ($self-verbose || 0));
}
sub _bliblib {
my $self = shift;
return (
'-I', File::Spec-catdir($self-base_dir, $self-blib, 'lib'),
'-I', File::Spec-catdir($self-base_dir, $self-blib, 'arch'),
);
}
sub ACTION_test {
my $self = shift;
$self-depends_on('code');
$self-depends_on('run_tests');
$self-depends_on('test_clean');
}
sub _cmodules {
my ($self, $action) = @_;
die The cmodules . ( $action ne 'all' ? _$action : '')
. action is not yet implemented;
# XXX TBD.
my $start_dir = $self-cwd;
chdir $self-localize_file_path('c-modules');
# XXX How do we get the right make?
$self-do_system('make', $action);
chdir $start_dir;
}
sub ACTION_cmodules { shift-_cmodues('all') }
sub ACTION_cmodules_clean { shift-_cmodues('clean') }
# XXX I'd love to make this optional.
sub generate_test_script {
my $self = shift;
# If a file name has been passed in, use it. Otherwise, use the
# one set up when the Apache::TestMB object was created.
my $script = $self-localize_file_path($_[0]
? $self-apache_test_script(shift)
: $self-apache_test_script
);
# We need a class to run the tests from t/TEST.
my $class = pop || 'Apache::TestRunPerl';
# Delete any existing instance of the file.
unlink $script if -e $script;
# Start the contents of t/TEST.
my $body = BEGIN { eval { require blib; } }\n
. Apache::TestConfig-modperl_2_inc_fixup;
# Configure the arguments for t/TEST.
while (my($k, $v) = each %{ $self-apache_test_args }) {
$v =~ s/\|/\\|/g;
$body .= \n\$Apache::TestConfig::Argv{'$k'} = q|$v|;\n;
}
my $infile = $script.PL;
if (-f $infile) {
# Use the existing t/TEST.PL.
my $in = Symbol::gensym();
open $in, $infile or die Couldn't open $infile: $!;
local $/;
$body .= $in;
close $in;
} else {
# Create t/TEST from scratch.
$body .= join \n,
Apache::TestConfig-perlscript_header,
use $class ();,
$class-new-run([EMAIL PROTECTED]);;
}
# Make it so!
print Generating test running script $script\n;
Apache::Test::config()-write_perlscript($script, $body);
$self-add_to_cleanup($self-apache_test_script);
}
1;
__END__
=head1 NAME
Apache::TestMB - Subclass of Module::Build to support Apache::Test
=head1 SYNOPSIS
Standard process for building installing modules:
perl Build.PL
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/05/27 19:07:35 Modified:perl-framework/Apache-Test Changes Log: whitespace separator Revision ChangesPath 1.137 +2 -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.136 retrieving revision 1.137 diff -u -u -r1.136 -r1.137 --- Changes 27 May 2004 12:37:04 - 1.136 +++ Changes 28 May 2004 02:07:35 - 1.137 @@ -14,6 +14,8 @@ Tweak Apache::TestRun to support test filenames starting with /(.\\)?t\\/ prefixes, windows style (needed for t/SMOKE) [Steve Hay] + + =item 1.11 - May 21, 2004 if we fail to match the Apache revision (which is OK at the early
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/05/25 19:14:36
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
Tweak Apache::TestRun to support test filenames starting with
/(.\\)?t\\/ prefixes, windows style (needed for t/SMOKE)
Revision ChangesPath
1.170 +5 -5
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.169
retrieving revision 1.170
diff -u -u -r1.169 -r1.170
--- TestRun.pm13 May 2004 01:09:26 - 1.169
+++ TestRun.pm26 May 2004 02:14:36 - 1.170
@@ -29,7 +29,7 @@
use ExtUtils::MakeMaker;
use File::Find qw(finddepth);
use File::Path;
-use File::Spec::Functions qw(catfile catdir);
+use File::Spec::Functions qw(catfile catdir canonpath);
use File::Basename qw(basename dirname);
use Getopt::Long qw(GetOptions);
use Config;
@@ -150,9 +150,9 @@
my @leftovers = ();
for (@$argv) {
my $arg = $_;
-# need the t/ for stat-ing, but don't want to include it in
-# test output
-$arg =~ [EMAIL PROTECTED](?:\./)?t/@@;
+# need the t/ (or t\) for stat-ing, but don't want to include
+# it in test output
+$arg =~ [EMAIL PROTECTED](?:\.[\\/])?t[\\/]@@;
my $file = catfile $t_dir, $arg;
if (-d $file and $_ ne '/') {
my @files = $file/*.t;
@@ -185,7 +185,7 @@
push @leftovers, $_;
}
-$self-{tests} = [EMAIL PROTECTED];
+$self-{tests} = [ map { canonpath($_) } @tests ];
$self-{argv} = [EMAIL PROTECTED];
}
1.134 +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.133
retrieving revision 1.134
diff -u -u -r1.133 -r1.134
--- Changes 21 May 2004 18:29:51 - 1.133
+++ Changes 26 May 2004 02:14:36 - 1.134
@@ -10,6 +10,9 @@
=item 1.11 - May 21, 2004
+Tweak Apache::TestRun to support test filenames starting with
+/(.\\)?t\\/ prefixes, windows style (needed for t/SMOKE) [Steve Hay]
+
if we fail to match the Apache revision (which is OK at the early
stages, like 'perl Makefile.PL', default to a non-existing revision
0. But provide no more misleading defaults (used to default to
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
stas2004/05/20 11:56:32
Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
add a dummy config for the tmp rev 0 before we get a change to get the
real server and its revision
Revision ChangesPath
1.224 +4 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -u -r1.223 -r1.224
--- TestConfig.pm 7 May 2004 17:59:22 - 1.223
+++ TestConfig.pm 20 May 2004 18:56:32 - 1.224
@@ -991,6 +991,10 @@
#need to configure the vhost port for redirects and $ENV{SERVER_PORT}
#to have the correct values
my %servername_config = (
+0 = sub {
+my($name, $port) = @_;
+[ServerName = ''], [Port = 0];
+},
1 = sub {
my($name, $port) = @_;
[ServerName = $name], [Port = $port];
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
stas2004/04/18 19:38:58 Modified:perl-framework/Apache-Test Changes RELEASE perl-framework/Apache-Test/lib/Apache Test.pm Log: start a new dev track: 1.11-dev Revision ChangesPath 1.126 +6 -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.125 retrieving revision 1.126 diff -u -u -r1.125 -r1.126 --- Changes 19 Apr 2004 02:27:32 - 1.125 +++ Changes 19 Apr 2004 02:38:58 - 1.126 @@ -6,6 +6,12 @@ =over 3 +=item 1.11-dev + + + + + =item 1.10 - April 18, 2004 Quote and escape the executables in the shell calls [Ken Coar, Stas] 1.9 +6 -3 httpd-test/perl-framework/Apache-Test/RELEASE Index: RELEASE === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/RELEASE,v retrieving revision 1.8 retrieving revision 1.9 diff -u -u -r1.8 -r1.9 --- RELEASE 9 Mar 2004 01:21:32 - 1.8 +++ RELEASE 19 Apr 2004 02:38:58 - 1.9 @@ -47,7 +47,7 @@ 5. Announce the package a. post ... to the modperl, announce lists - Subject: [ANNOUNCE] Apache-Test 1.10 + Subject: [ANNOUNCE] Apache-Test 1.11 include - MD5 sig (as it comes from CPAN upload announce). - the latest Changes @@ -59,13 +59,16 @@ b. edit ./Changes: - start a new item with incremented version + '-dev' - =item 1.11-dev + =item 1.12-dev c. bump up version numbers in this file to make it easier to do the next release. + perl -pi -e 's/\.12/.13/g' RELEASE perl -pi -e 's/\.11/.12/g' RELEASE - perl -pi -e 's/\.10/.11/g' RELEASE + + now reload this file and bump up the last number of the first + command. d. commit Changes % cvs ci Changes RELEASE lib/Apache/Test.pm 1.79 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm Index: Test.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v retrieving revision 1.78 retrieving revision 1.79 diff -u -u -r1.78 -r1.79 --- Test.pm 15 Apr 2004 13:17:02 - 1.78 +++ Test.pm 19 Apr 2004 02:38:58 - 1.79 @@ -36,7 +36,7 @@ %EXPORT_TAGS = (withtestmore = [EMAIL PROTECTED]); -$VERSION = '1.10'; +$VERSION = '1.11'; %SubTests = (); @SkipReasons = ();
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestMM.pm TestRun.pm
stas2004/04/16 12:47:42
Modified:perl-framework/Apache-Test/lib/Apache TestMM.pm TestRun.pm
Log:
@Apache::TestMM::Argv has to be reusable, so don't empty it
Revision ChangesPath
1.34 +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.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- TestMM.pm 16 Apr 2004 19:23:40 - 1.33
+++ TestMM.pm 16 Apr 2004 19:47:42 - 1.34
@@ -90,7 +90,8 @@
$body .= Apache::TestConfig-modperl_2_inc_fixup;
-while (my($k, $v) = splice @Apache::TestMM::Argv, 0, 2) {
+my %args = @Apache::TestMM::Argv;
+while (my($k, $v) = each %args) {
$v =~ s/\|/\\|/g;
$body .= \n\$Apache::TestConfig::Argv{'$k'} = q|$v|;\n;
}
1.165 +2 -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.164
retrieving revision 1.165
diff -u -u -r1.164 -r1.165
--- TestRun.pm16 Apr 2004 19:23:40 - 1.164
+++ TestRun.pm16 Apr 2004 19:47:42 - 1.165
@@ -1221,7 +1221,8 @@
$body .= Apache::TestConfig-modperl_2_inc_fixup;
-while (my($k, $v) = splice @Apache::TestMM::Argv, 0, 2) {
+my %args = @Apache::TestMM::Argv;
+while (my($k, $v) = each %args) {
$v =~ s/\|/\\|/g;
$body .= \n\$Apache::TestConfig::Argv{'$k'} = q|$v|;\n;
}
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm TestRun.pm
stas2004/04/16 13:29:23
Modified:perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestConfigParse.pm TestRun.pm
Log:
Quote and escape the executables in the shell calls
Revision ChangesPath
1.124 +2 -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.123
retrieving revision 1.124
diff -u -u -r1.123 -r1.124
--- Changes 16 Apr 2004 19:23:40 - 1.123
+++ Changes 16 Apr 2004 20:29:23 - 1.124
@@ -8,6 +8,8 @@
=item 1.10-dev
+Quote and escape the executables in the shell calls [Ken Coar, Stas]
+
Quote and escape filtered args received during 'perl Makefile.PL'
[Geoffrey Young, Ken Coar]
1.222 +12 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -u -r1.221 -r1.222
--- TestConfig.pm 15 Apr 2004 13:00:24 - 1.221
+++ TestConfig.pm 16 Apr 2004 20:29:23 - 1.222
@@ -1526,7 +1526,8 @@
my($self, $q, $ok_fail) = @_;
return unless $self-{APXS};
my $devnull = devnull();
-my $val = qx($self-{APXS} -q $q 2$devnull);
+my $apxs = shell_ready($self-{APXS});
+my $val = qx($apxs -q $q 2$devnull);
chomp $val if defined $val; # apxs post-2.0.40 adds a new line
unless ($val) {
if ($ok_fail) {
@@ -1648,6 +1649,7 @@
# httpd opts
my $test_config = Apache::TestConfig-new({thaw=1});
if (my $httpd = $test_config-{vars}-{httpd}) {
+$httpd = shell_ready($httpd);
$command = $httpd -V;
$cfg .= \n*** $command\n;
$cfg .= qx{$command};
@@ -1656,12 +1658,20 @@
}
# perl opts
-my $perl = $^X;
+my $perl = shell_ready($^X);
$command = $perl -V;
$cfg .= \n\n*** $command\n;
$cfg .= qx{$command};
return $cfg;
+}
+
+# make a string suitable for feed to shell calls (wrap in quotes and
+# escape quotes)
+sub shell_ready {
+my $arg = shift;
+$arg =~ s//\/g;
+return qq[$arg];
}
1;
1.46 +3 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Index: TestConfigParse.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -u -r1.45 -r1.46
--- TestConfigParse.pm7 Apr 2004 22:11:58 - 1.45
+++ TestConfigParse.pm16 Apr 2004 20:29:23 - 1.46
@@ -364,6 +364,7 @@
my $httpd = $self-{vars}-{httpd};
return unless $httpd;
+$httpd = shell_ready($httpd);
my $cmd = $httpd -l;
my $list = $self-open_cmd($cmd);
@@ -384,6 +385,7 @@
my $httpd = $self-{vars}-{httpd};
return unless $httpd;
+$httpd = shell_ready($httpd);
my $cmd = $httpd -V;
my $proc = $self-open_cmd($cmd);
@@ -435,6 +437,7 @@
return unless $httpd;
my $version;
+$httpd = shell_ready($httpd);
my $cmd = $httpd -v;
my $v = $self-open_cmd($cmd);
1.166 +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.165
retrieving revision 1.166
diff -u -u -r1.165 -r1.166
--- TestRun.pm16 Apr 2004 19:47:42 - 1.165
+++ TestRun.pm16 Apr 2004 20:29:23 - 1.166
@@ -1012,7 +1012,7 @@
# test that the base dir is rwx by the selected non-root user
my $vars = $self-{test_config}-{vars};
my $dir = $vars-{t_dir};
-my $perl = $vars-{perl};
+my $perl = Apache::TestConfig::shell_ready($vars-{perl});
# find where Apache::TestRun was loaded from, so we load this
# exact package from the external process
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestUtil.pm
stas2004/04/12 11:09:14 Modified:perl-framework/Apache-Test/lib/Apache TestUtil.pm Log: actually in this case () aren't needed Revision ChangesPath 1.36 +1 -3 httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm Index: TestUtil.pm === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -u -u -r1.35 -r1.36 --- TestUtil.pm 12 Apr 2004 18:02:15 - 1.35 +++ TestUtil.pm 12 Apr 2004 18:09:14 - 1.36 @@ -444,9 +444,7 @@ or use a scalar context: - t_cmp($expected, scalar(foo()), may return undef) - -the parentheses for the Cscalar()'s expression are mandatory here. + t_cmp($expected, scalar foo(), may return undef) This function is exported by default.
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/04/07 15:11:58
Modified:perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
perl-framework/Apache-Test Changes
Log:
Support continuous configuration line when parsing the inherited
configuration file
Revision ChangesPath
1.45 +9 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Index: TestConfigParse.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -u -r1.44 -r1.45
--- TestConfigParse.pm1 Apr 2004 23:57:17 - 1.44
+++ TestConfigParse.pm7 Apr 2004 22:11:58 - 1.45
@@ -272,6 +272,15 @@
while ($fh) {
s/^\s*//; s/\s*$//; s/^\#.*//;
next if /^$/;
+
+# support continuous config lines (which use \ to break the line)
+while (s/\\$//) {
+my $cont = $fh;
+$cont =~ s/^\s*//;
+$cont =~ s/\s*$//;
+$_ .= $cont;
+}
+
(my $directive, $_) = split /\s+/, $_, 2;
if ($directive eq Include) {
1.119 +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.118
retrieving revision 1.119
diff -u -u -r1.118 -r1.119
--- Changes 7 Apr 2004 21:51:36 - 1.118
+++ Changes 7 Apr 2004 22:11:58 - 1.119
@@ -8,6 +8,9 @@
=item 1.10-dev
+Support continuous configuration line when parsing the inherited
+configuration file [Stas]
+
Since some of the inherited from the global httpd.conf modules require
mod_perl to be loaded first, orrange for that to happen. [Stas]
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/04/04 21:35:21
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
TestConfig.pm
perl-framework/Apache-Test Changes
Log:
Don't try to set ulimit unlimited for coredumps on Solaris, unless run
as root
Submitted by: Rob Kinyon [EMAIL PROTECTED]
Revision ChangesPath
1.163 +11 -0
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.162
retrieving revision 1.163
diff -u -u -r1.162 -r1.163
--- TestRun.pm25 Mar 2004 01:31:28 - 1.162
+++ TestRun.pm5 Apr 2004 04:35:21 - 1.163
@@ -616,6 +616,17 @@
sub set_ulimit_via_sh {
return if Apache::TestConfig::WINFU;
return if $ENV{APACHE_TEST_ULIMIT_SET};
+
+# only root can allow unlimited core dumps on Solaris (8 9?)
+if (Apache::TestConfig::SOLARIS) {
+my $user = getpwuid($) || '';
+if ($user ne 'root') {
+warning Skipping 'set unlimited ulimit for coredumps', .
+since we are running as a non-root user on Solaris;
+return;
+}
+}
+
my $binsh = '/bin/sh';
return unless -e $binsh;
$ENV{APACHE_TEST_ULIMIT_SET} = 1;
1.218 +1 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -u -r1.217 -r1.218
--- TestConfig.pm 1 Apr 2004 23:57:17 - 1.217
+++ TestConfig.pm 5 Apr 2004 04:35:21 - 1.218
@@ -20,6 +20,7 @@
use constant WIN32 = $^O eq 'MSWin32';
use constant CYGWIN = $^O eq 'cygwin';
use constant NETWARE = $^O eq 'NetWare';
+use constant SOLARIS = $^O eq 'solaris';
use constant WINFU = WIN32 || CYGWIN || NETWARE;
use constant COLOR = ($ENV{APACHE_TEST_COLOR} -t STDOUT) ? 1 : 0;
1.117 +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.116
retrieving revision 1.117
diff -u -u -r1.116 -r1.117
--- Changes 2 Apr 2004 00:07:53 - 1.116
+++ Changes 5 Apr 2004 04:35:21 - 1.117
@@ -8,6 +8,9 @@
=item 1.10-dev
+Don't try to set ulimit unlimited for coredumps on Solaris, unless run
+as root [Rob Kinyon [EMAIL PROTECTED]]
+
Added '-httpd_conf_extra filename' configuration option to
allow a file of server config directives to be inherited
in addition to the server's own httpd.conf file (or the one
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm
Geoffrey Young wrote: [EMAIL PROTECTED] wrote: coar2004/04/01 15:57:17 Modified:perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm Log: add an '-httpd_conf_extra filename' option to allow an *additional* server config file to be inherited as well as the server's main one (or one specified with -httpd_conf). ok, I guess you guys figured out how to do it :) Looks like Ken's hair started to grow again, after he had it all lost over this case :) anyway, if I can interject a few comments on the idea... we already have a few files that get magical treatment: extra.conf.in, extra.last.conf.in, modperl_startup.pl, etc. I think the way I would do it (from afar :) is to create yet another special case, maybe httpd.extra.conf.in or somesuch. advantages would be that it would follow the approach we've been using, it wouldn't require an extra runtime argument, and it could benefit from variable subsitution like all the other conf files. That probably won't suite Ken's particular need. What Ken was after is to be able to throw random .so modules into some directory and tell Apache::Test to detect them, load them and have have_module() see them. and Ken really wants to have lots of these directories and point every time to a different one. So all he does now is generating a simple extra.conf which only lists LoadModule directives with the correct path to those modules, A-T picks them up and doesn't require c-modules any longer (Ken wants to pre-build c-modules for many architectures and many apache versions). I like this Ken's new option because it'll suite cases where a user can't modify the global httpd.conf, but will be able to add its own global httpd.conf extra's via this option. We have also discussed to make it accept more than one file, but at the moment it's not possible and will require quite a few changes (currently config is a hash and it's set in more than one place). doable, but we probably shouldn't touch it until someone will really need it. While we discussed possible solutions, I suggested an idea to figure out whether we have a compiler at all, and if not skip even trying to build c-modules. So if you build things on machine A with a compiler and then tar things up and move it to machine B w/o a compiler (same architecture), the modules will be already precompiled and ready to use and t/TEST -clean won't nuke them. Ken said that this idea didn't suite him, but I think it could be useful to others. The kludge is how to figure out whether things will be able to compile or not (whether there is a compiler at all). __ Stas BekmanJAm_pH -- Just Another mod_perl Hacker http://stason.org/ mod_perl Guide --- http://perl.apache.org mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRunPerl.pm
stas2004/03/31 00:35:48 Modified:perl-framework/Apache-Test/lib/Apache TestRunPerl.pm Log: make CPAN.pm's r() version scanner happy Revision ChangesPath 1.18 +3 -0 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.17 retrieving revision 1.18 diff -u -u -r1.17 -r1.18 --- TestRunPerl.pm25 Mar 2004 01:29:36 - 1.17 +++ TestRunPerl.pm31 Mar 2004 08:35:48 - 1.18 @@ -21,6 +21,9 @@ use Apache::TestConfigParse (); use Apache::TestTrace; +use vars qw($VERSION); +$VERSION = '1.00'; # make CPAN.pm's r() version scanner happy + use File::Spec::Functions qw(catfile); #subclass of Apache::TestRun that configures mod_perlish things
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/25 17:17:08 Modified:perl-framework/Apache-Test/lib/Apache TestMM.pm perl-framework/Apache-Test Changes Log: explain where to get the list of config options suitable for passing to Makefile.PL, and their usage Submitted by: David Wheeler [EMAIL PROTECTED] Revision ChangesPath 1.32 +21 -6 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.31 retrieving revision 1.32 diff -u -u -r1.31 -r1.32 --- TestMM.pm 4 Mar 2004 05:51:31 - 1.31 +++ TestMM.pm 26 Mar 2004 01:17:08 - 1.32 @@ -164,12 +164,13 @@ Apache::TestMM::filter_args(); WriteMakefile(...); -When CWriteMakefile() is called it parses C@ARGV, hoping to find special -options like CPREFIX=/home/stas/perl. CApache::Test accepts a lot of -options of its own. When CApache::TestMM::filter_args() is called, it -removes any CApache::Test-specific options from C@ARGV and stores them -internally, so when CWriteMakefile() is called they aren't in C@ARGV and -thus won't be processed by CWriteMakefile(). +When CWriteMakefile() is called it parses C@ARGV, hoping to find +special options like CPREFIX=/home/stas/perl. CApache::Test +accepts a lot of configuration options of its own. When +CApache::TestMM::filter_args() is called, it removes any +CApache::Test-specific options from C@ARGV and stores them +internally, so when CWriteMakefile() is called they aren't in +C@ARGV and thus won't be processed by CWriteMakefile(). The options can be set when FMakefile.PL is called: @@ -190,6 +191,20 @@ %Apache::TestConfig::Argv = qw(apxs /path/to/apxs); which is going to be used by the CApache::Test runtime. + +The other frequently used options are: C-httpd, telling where to +find the httpd (usually when the C-apxs option is not used), +C-libmodperl to use a specific mod_perl shared object (if your +mod_perl is built as DSO), C-maxclients to change the default number +of the configured CMaxClients directive, C-port to start the +server on a specific port, etc. To get the complete list of available +configuration options and their purpose and syntax, run: + + % perl -MApache::TestConfig -le 'Apache::TestConfig::usage()' + +You may wish to document some of these in your application's FREADME +file, especially the C-apxs and C-httpd options. + =head2 Cgenerate_script 1.114 +2 -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.113 retrieving revision 1.114 diff -u -u -r1.113 -r1.114 --- Changes 25 Mar 2004 01:31:29 - 1.113 +++ Changes 26 Mar 2004 01:17:08 - 1.114 @@ -8,6 +8,8 @@ =item 1.10-dev +improved docs [David Wheeler [EMAIL PROTECTED]] + Add a virtual method Apache::TestRun::pre_configure, and fix the documentation to say that subclasses must not forget to run the superclass' method. [Stas]
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/24 17:31:29
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
Add a virtual method Apache::TestRun::pre_configure, and fix the
documentation to say that subclasses must not forget to run the
superclass' method.
Revision ChangesPath
1.162 +9 -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.161
retrieving revision 1.162
diff -u -u -r1.161 -r1.162
--- TestRun.pm11 Mar 2004 23:20:10 - 1.161
+++ TestRun.pm25 Mar 2004 01:31:28 - 1.162
@@ -458,6 +458,8 @@
$test_config-postamble_register($postamble);
}
+sub pre_configure { }
+
sub configure {
my $self = shift;
@@ -677,7 +679,7 @@
# must be called after getopts so the tracing will be set right
custom_config_load();
-$self-pre_configure() if $self-can('pre_configure');
+$self-pre_configure();
$self-{test_config} = $self-new_test_config();
@@ -1797,9 +1799,15 @@
my $self = shift;
# Don't load an installed mod_apreq
Apache::TestConfig::autoconfig_skip_module_add('mod_apreq.c');
+
+ $self-SUPER::pre_configure();
}
Notice that the extension is I.c, and not I.so.
+
+Don't forget to run the super class' cpre_configure() method.
+
+
=head2 Cnew_test_config
1.113 +4 -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.112
retrieving revision 1.113
diff -u -u -r1.112 -r1.113
--- Changes 16 Mar 2004 03:10:32 - 1.112
+++ Changes 25 Mar 2004 01:31:29 - 1.113
@@ -8,6 +8,10 @@
=item 1.10-dev
+Add a virtual method Apache::TestRun::pre_configure, and fix the
+documentation to say that subclasses must not forget to run the
+superclass' method. [Stas]
+
Apache::TestRunPerl now performs an early check whether it can load
the right mod_perl environment. [William McKee [EMAIL PROTECTED],
Stas]
cvs commit: httpd-test/perl-framework/Apache-Test ToDo
stas2004/03/16 10:10:14 Modified:perl-framework/Apache-Test ToDo Log: todo Revision ChangesPath 1.9 +7 -0 httpd-test/perl-framework/Apache-Test/ToDo Index: ToDo === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/ToDo,v retrieving revision 1.8 retrieving revision 1.9 diff -u -u -r1.8 -r1.9 --- ToDo 18 Feb 2004 00:30:57 - 1.8 +++ ToDo 16 Mar 2004 18:10:14 - 1.9 @@ -1,3 +1,10 @@ +- Custom sticky config: invalidate invalid bits of the saved config, + e.g. if apxs is saved but can't be found on the filesystem. So if + someone installs Apache in one location, runs A-T which saves that + location, and then nukes Apache and reinstalls it into a different + location we should drop the previously saved config since the path + to apxs and/or httpd is now invalid. + - Apache-Test doesn't run on IPv6 systems, need to change the autogeneration of httpd.conf to support IPv6. It requires a replacement of 'Listen 80' with 'Listen servername:80'
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/09 23:03:31
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
make the project's test suite relocatable, handling the case where
after Apache-Test configuration was created and not cleaned up before
the directory was moved. This is especially important for those cases
where users try to run 'make test' as root from /root, A-T tells them
that they can't do that (because of the perms) and suggests to try
again, afer moving the whole project under /tmp or similar.
Revision ChangesPath
1.158 +55 -3
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.157
retrieving revision 1.158
diff -u -u -r1.157 -r1.158
--- TestRun.pm9 Mar 2004 20:43:53 - 1.157
+++ TestRun.pm10 Mar 2004 07:03:30 - 1.158
@@ -668,6 +668,8 @@
$self-set_ulimit;
$self-set_env; #make sure these are always set
+$self-detect_relocation($orig_cwd);
+
my(@argv) = @_;
$self-getopts([EMAIL PROTECTED]);
@@ -679,9 +681,6 @@
$self-{test_config} = $self-new_test_config();
-# make it easy to move the whole distro
-$self-refresh unless -e $self-{test_config}-{vars}-{top_dir};
-
$self-warn_core();
$self-{server} = $self-{test_config}-server;
@@ -725,6 +724,59 @@
$self-run_tests;
$self-stop;
+}
+
+# make it easy to move the whole distro w/o running
+# 't/TEST -clean' before moving. when moving the whole package,
+# the old cached config will stay, so we want to nuke it only if
+# we realize that it's no longer valid. we can't just check the
+# existance of the saved top_dir value, since the project may have
+# been copied and the old dir could be still there, but that's not
+# the one that we work in
+sub detect_relocation {
+my($self, $cur_top_dir) = @_;
+
+my $config_file = catfile qw(t conf apache_test_config.pm);
+return unless -e $config_file;
+
+my %inc = %INC;
+eval { require $config_file };
+warn($@), return if $@;
+
+my $cfg = 'apache_test_config'-new;
+%INC = %inc; # be stealth
+
+# if the top_dir from saved config doesn't match the current
+# top_dir, that means that the whole project was relocated to a
+# different directory, w/o running t/TEST -clean first (in each
+# directory with a test suite)
+my $cfg_top_dir = $cfg-{vars}-{top_dir};
+return unless $cfg_top_dir;
+return if $cfg_top_dir eq $cur_top_dir;
+
+# if that's the case silently fixup the saved config to use the
+# new paths, and force a complete cleanup. if we don't fixup the
+# config files, the cleanup process won't be able to locate files
+# to delete and re-configuration will fail
+{
+# in place editing
+local @ARGV = $config_file;
+local $^I = ;
+while () {
+s{$cfg_top_dir}{$cur_top_dir}g;
+print;
+}
+}
+
+my $cleanup_cmd = $^X $0 -clean;
+warning cleaning up the old config;
+# XXX: do we care to check success?
+system $cleanup_cmd;
+
+# XXX: I tried hard to accomplish that w/o starting a new process,
+# but too many things get on the way, so for now just keep it as an
+# external process, as it's absolutely transparent to the normal
+# app-run
}
my @oh = qw(jeez golly gosh darn shucks dangit rats nuts dangnabit crap);
1.110 +7 -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.109
retrieving revision 1.110
diff -u -u -r1.109 -r1.110
--- Changes 9 Mar 2004 20:45:01 - 1.109
+++ Changes 10 Mar 2004 07:03:31 - 1.110
@@ -8,6 +8,13 @@
=item 1.10-dev
+make the project's test suite relocatable, handling the case where
+after Apache-Test configuration was created and not cleaned up before
+the directory was moved. This is especially important for those cases
+where users try to run 'make test' as root from /root, A-T tells them
+that they can't do that (because of the perms) and suggests to try
+again, afer moving the whole project under /tmp or similar. [Stas]
+
When running as 'root' make the client side drop the root permissions
and run with the same permissions as the server side
(e.g. nobody). This is needed in case the client side creates any
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
stas2004/03/09 23:09:24
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
restore %INC before returning
Revision ChangesPath
1.159 +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.158
retrieving revision 1.159
diff -u -u -r1.158 -r1.159
--- TestRun.pm10 Mar 2004 07:03:30 - 1.158
+++ TestRun.pm10 Mar 2004 07:09:24 - 1.159
@@ -741,10 +741,10 @@
my %inc = %INC;
eval { require $config_file };
+%INC = %inc; # be stealth
warn($@), return if $@;
my $cfg = 'apache_test_config'-new;
-%INC = %inc; # be stealth
# if the top_dir from saved config doesn't match the current
# top_dir, that means that the whole project was relocated to a
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/08 22:31:05
Modified:perl-framework/Apache-Test/lib/Apache TestUtil.pm
perl-framework/Apache-Test Changes
Log:
t_server_log_error_is_expected t_server_log_warn_is_expected
t_client_log_error_is_expected t_client_log_warn_is_expected
now support an optional argument, suggesting how many entries
to expect
Revision ChangesPath
1.34 +39 -10
httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm
Index: TestUtil.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- TestUtil.pm 4 Mar 2004 05:51:32 - 1.33
+++ TestUtil.pm 9 Mar 2004 06:31:05 - 1.34
@@ -286,8 +286,19 @@
}
my $banner_format =
-\n*** The following %s entry is expected and it is harmless ***\n;
-sub t_server_log_is_expected { printf STDERR $banner_format, $_[0]; }
+\n*** The following %s expected and harmless ***\n;
+
+sub is_expected_banner {
+my $type = shift;
+my $count = @_ ? shift : 1;
+sprintf $banner_format, $count == 1
+? $type entry is
+: $count $type entries are;
+}
+
+sub t_server_log_is_expected {
+print STDERR is_expected_banner(@_);
+}
sub t_client_log_is_expected {
my $vars = Apache::Test::config()-{vars};
@@ -296,14 +307,14 @@
my $fh = Symbol::gensym();
open $fh, $log_file or die Can't open $log_file: $!;
my $oldfh = select($fh); $| = 1; select($oldfh);
-printf $fh $banner_format, $_[0];
+print $fh is_expected_banner(@_);
close $fh;
}
-sub t_server_log_error_is_expected { t_server_log_is_expected(error);}
-sub t_server_log_warn_is_expected { t_server_log_is_expected(warn); }
-sub t_client_log_error_is_expected { t_client_log_is_expected(error);}
-sub t_client_log_warn_is_expected { t_client_log_is_expected(warn); }
+sub t_server_log_error_is_expected { t_server_log_is_expected(error, @_);}
+sub t_server_log_warn_is_expected { t_server_log_is_expected(warn, @_); }
+sub t_client_log_error_is_expected { t_client_log_is_expected(error, @_);}
+sub t_client_log_warn_is_expected { t_client_log_is_expected(warn, @_); }
END {
# remove files that were created via this package
@@ -577,9 +588,18 @@
After running this handler the Ierror_log file will include:
- *** The following error entry is expected and it is harmless ***
+ *** The following error entry is expected and harmless ***
[Tue Apr 01 14:00:21 2003] [error] failed because ...
+When more than one entry is expected, an optional numerical argument,
+indicating how many entries to expect, can be passed. For example:
+
+ t_server_log_error_is_expected(2);
+
+will generate:
+
+ *** The following 2 error entries are expected and harmless ***
+
If the error is generated at compile time, the logging must be done in
the BEGIN block at the very beginning of the file:
@@ -592,7 +612,7 @@
After attempting to run this handler the Ierror_log file will
include:
- *** The following error entry is expected and it is harmless ***
+ *** The following error entry is expected and harmless ***
[Tue Apr 01 14:04:49 2003] [error] Can't locate DOES_NOT_exist.pm
in @INC (@INC contains: ...
@@ -637,9 +657,18 @@
After running this test the Ierror_log file will include an entry
similar to the following snippet:
- *** The following error entry is expected and it is harmless ***
+ *** The following error entry is expected and harmless ***
[Tue Apr 01 14:02:55 2003] [error] [client 127.0.0.1]
File does not exist: /tmp/test/t/htdocs/error
+
+When more than one entry is expected, an optional numerical argument,
+indicating how many entries to expect, can be passed. For example:
+
+ t_client_log_error_is_expected(2);
+
+will generate:
+
+ *** The following 2 error entries are expected and harmless ***
This function is exported by default.
1.107 +4 -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.106
retrieving revision 1.107
diff -u -u -r1.106 -r1.107
--- Changes 9 Mar 2004 01:21:32 - 1.106
+++ Changes 9 Mar 2004 06:31:05 - 1.107
@@ -8,6 +8,10 @@
=item 1.10-dev
+t_server_log_error_is_expected t_server_log_warn_is_expected
+t_client_log_error_is_expected t_client_log_warn_is_expected
+now support an optional argument, suggesting how many entries
+to expect [Stas]
=item 1.09 - March 8, 2004
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/09 12:43:54
Modified:perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
When running as 'root' make the client side drop the root permissions
and run with the same permissions as the server side
(e.g. nobody). This is needed in case the client side creates any
files after the initial check (during server side startup and beyond),
so that the server side could read/write them.
Revision ChangesPath
1.157 +21 -0
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.156
retrieving revision 1.157
diff -u -u -r1.156 -r1.157
--- TestRun.pm4 Mar 2004 05:51:31 - 1.156
+++ TestRun.pm9 Mar 2004 20:43:53 - 1.157
@@ -881,6 +881,7 @@
$self-check_perms($user, $uid, $gid);
+$self-become_nonroot($user, $uid, $gid);
}
}
@@ -986,6 +987,26 @@
skip_test_suite();
exit_perl 0;
}
+}
+
+# in case the client side creates any files after the initial chown
+# adjustments we want the server side to be able to read/write them, so
+# they better be with the same permissions. dropping root permissions
+# and becoming the same user as the server side solves this problem.
+sub become_nonroot {
+my ($self, $user, $uid, $gid) = @_;
+
+warning the client side drops 'root' permissions and becomes '$user';
+
+# first must change gid and egid ($gid $gid for an empty
+# setgroups() call as explained in perlvar.pod)
+my $groups = $gid $gid;
+$( = $) = $groups;
+die failed to change gid to $gid unless $( eq $groups $) eq $groups;
+
+# only now can change uid and euid
+$ = $ = $uid+0;
+die failed to change uid to $uid unless $ == $uid $ == $uid;
}
sub run_request {
1.108 +6 -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.107
retrieving revision 1.108
diff -u -u -r1.107 -r1.108
--- Changes 9 Mar 2004 06:31:05 - 1.107
+++ Changes 9 Mar 2004 20:43:53 - 1.108
@@ -8,6 +8,12 @@
=item 1.10-dev
+When running as 'root' make the client side drop the root permissions
+and run with the same permissions as the server side
+(e.g. nobody). This is needed in case the client side creates any
+files after the initial check (during server side startup and beyond),
+so that the server side could read/write them. [Stas]
+
t_server_log_error_is_expected t_server_log_warn_is_expected
t_client_log_error_is_expected t_client_log_warn_is_expected
now support an optional argument, suggesting how many entries
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/09 12:45:01
Modified:perl-framework/Apache-Test Changes
Log:
add some white space between releases
Revision ChangesPath
1.109 +20 -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.108
retrieving revision 1.109
diff -u -u -r1.108 -r1.109
--- Changes 9 Mar 2004 20:43:53 - 1.108
+++ Changes 9 Mar 2004 20:45:01 - 1.109
@@ -19,6 +19,8 @@
now support an optional argument, suggesting how many entries
to expect [Stas]
+
+
=item 1.09 - March 8, 2004
remove the dependency on APR::UUID (i.e. mod_perl 2.0) in the
@@ -37,6 +39,8 @@
fix the custom config use for Apache-Test's own upgrades [Stas]
+
+
=item 1.08 - February 24, 2004
Instead of hard-coding listen directive to 127.0.0.1, use the server
@@ -121,6 +125,8 @@
option) reusable configuration for -httpd, -apxs, -user, -group, and
-port [Randy Kobes, Stas]
+
+
=item 1.07 - Decemeber 22, 2003
allow conditional C module compilation on a more granular level.
@@ -156,6 +162,8 @@
added bugreport and file argument options to
Apache::TestRun::generate_script() [Geoffrey Young]
+
+
=item 1.06 - November 10, 2003
added -startup_timeout and $ENV{APACHE_TEST_STARTUP_TIMEOUT} as places
@@ -174,6 +182,8 @@
suite is rwx by the user/group apache is going to run under (when
running 'make test' as root). [Stas]
+
+
=item 1.05 - October 23, 2003
core scanning changes [Stas]
@@ -219,6 +229,8 @@
normal operation. single server mode (httpd -X) was replaced
with MaxClients set to 1 by default. [Geoffrey Young]
+
+
=item 1.04 - September 29, 2003
if the server stops reading from the client before it has sent all its
@@ -286,6 +298,8 @@
Enable TransferLog in the autogenerated httpd.conf only if
mod_log_config is available [Stas]
+
+
=item 1.03 - June 19, 2003
Instrumented Makefile.PL to unconditionally remove any old
@@ -323,10 +337,14 @@
be able enable/disable tracing from the commmand line. This way we
don't have to comment out debug prints. [Stas]
+
+
=item 1.02
not released
+
+
=item 1.01 - May 1, 2003
improved support for 3rd party modules test configuration setup:
@@ -350,6 +368,8 @@
Autoconfigure Alias /getfiles-* only if the corresponding targets
exist [Stas]
+
+
=item 1.00 - Apr 28, 2003
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/08 15:44:28
Modified:perl-framework/Apache-Test/lib/Apache TestHandler.pm
perl-framework/Apache-Test Changes
Log:
remove the dependency on APR::UUID (i.e. mod_perl 2.0) in the
same_interpreter framework (use plain time/rand/$$ concatenation)
Revision ChangesPath
1.4 +2 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestHandler.pm
Index: TestHandler.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestHandler.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- TestHandler.pm4 Mar 2004 05:51:31 - 1.3
+++ TestHandler.pm8 Mar 2004 23:44:28 - 1.4
@@ -76,8 +76,8 @@
my $id = $same_interp_id;
if ($interp eq 'tie') { #first request for an interpreter instance
# unique id for this instance
-require APR::UUID;
-$same_interp_id = $id = APR::UUID-new-format;
+$same_interp_id = $id =
+unpack H*, pack Nnn, time, $$, int(rand(6));
$same_interp_counter = 0; #reset the counter
}
elsif ($interp ne $same_interp_id) {
1.104 +4 -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.103
retrieving revision 1.104
diff -u -u -r1.103 -r1.104
--- Changes 5 Mar 2004 13:22:11 - 1.103
+++ Changes 8 Mar 2004 23:44:28 - 1.104
@@ -8,6 +8,10 @@
=item 1.09-dev
+remove the dependency on APR::UUID (i.e. mod_perl 2.0) in the
+same_interpreter framework (use plain time/rand/$$ concatenation)
+[Stas]
+
Updated to the new Apache License Version 2.0 [Gozer]
handle cases on Win32 when supplied paths have spaces in their
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/08 15:46:18 Modified:perl-framework/Apache-Test Changes Log: 1.09 release Revision ChangesPath 1.105 +1 -1 httpd-test/perl-framework/Apache-Test/Changes Index: Changes === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v retrieving revision 1.104 retrieving revision 1.105 diff -u -u -r1.104 -r1.105 --- Changes 8 Mar 2004 23:44:28 - 1.104 +++ Changes 8 Mar 2004 23:46:18 - 1.105 @@ -6,7 +6,7 @@ =over 3 -=item 1.09-dev +=item 1.09 - March 8, 2004 remove the dependency on APR::UUID (i.e. mod_perl 2.0) in the same_interpreter framework (use plain time/rand/$$ concatenation)
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestServer.pm
stas2004/03/05 18:07:58
Modified:perl-framework/Apache-Test/lib/Apache TestServer.pm
Log:
if the server doesn't start, add a suggestion to try again with a higher
timeout value
Revision ChangesPath
1.81 +8 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Index: TestServer.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -u -r1.80 -r1.81
--- TestServer.pm 5 Mar 2004 13:22:11 - 1.80
+++ TestServer.pm 6 Mar 2004 02:07:58 - 1.81
@@ -560,7 +560,14 @@
last;
}
elsif ($delta $timeout) {
-print $preamble, giving up after $delta secs\n;
+my $suggestion = $timeout + 300;
+print $preamble, not ok\n;
+error EOI;
+giving up after $delta secs. If you think that your system
+is slow or overloaded try again with a longer timeout value.
+by setting the environment variable APACHE_TEST_STARTUP_TIMEOUT
+to a high value (e.g. $suggestion) and repeat the last command.
+EOI
last;
}
}
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/03/02 09:49:37
Modified:perl-framework/Apache-Test/lib/Apache TestConfigC.pm
perl-framework/Apache-Test Changes
Log:
c-modules build errors are no longer ignored
Revision ChangesPath
1.25 +5 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigC.pm
Index: TestConfigC.pm
===
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigC.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -u -r1.24 -r1.25
--- TestConfigC.pm8 Jan 2004 17:15:37 - 1.24
+++ TestConfigC.pm2 Mar 2004 17:49:36 - 1.25
@@ -123,13 +123,13 @@
for my $dir (@dirs) {
for my $targ (@targets) {
-print $fh $dir-$targ:\n\t-cd $dir \$(MAKE) $targ\n\n;
+print $fh $dir-$targ:\n\tcd $dir \$(MAKE) $targ\n\n;
}
my $lib = $self-cmodules_build_so($dir);
my $cfile = $dir/mod_$dir.c;
push @libs, $dir/$lib;
-print $fh $libs[-1]: $cfile\n\t-cd $dir \$(MAKE) $lib\n\n;
+print $fh $libs[-1]: $cfile\n\tcd $dir \$(MAKE) $lib\n\n;
}
for my $targ (@targets) {
@@ -211,6 +211,9 @@
my $cmd = cd $self-{cmodules_dir} $Config{make} $targ;
debug $cmd;
system $cmd;
+if ($?) {
+die Failed to build c-modules;
+}
}
sub cmodules_compile {
1.99 +2 -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.98
retrieving revision 1.99
diff -u -u -r1.98 -r1.99
--- Changes 26 Feb 2004 15:28:11 - 1.98
+++ Changes 2 Mar 2004 17:49:37 - 1.99
@@ -8,6 +8,8 @@
=item 1.09-dev
+c-modules build errors are no longer ignored [Stas]
+
change -DAPACHE1 (and like defines) to -D APACHE1 to fix Win32
compatibility issues [Steve Hay]
cvs commit: httpd-test/perl-framework/Apache-Test Changes
stas2004/02/24 18:27:33 Modified:perl-framework/Apache-Test Changes Log: APACHE_TEST_1_08 release Revision ChangesPath 1.95 +1 -1 httpd-test/perl-framework/Apache-Test/Changes Index: Changes === RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v retrieving revision 1.94 retrieving revision 1.95 diff -u -u -r1.94 -r1.95 --- Changes 21 Feb 2004 20:28:47 - 1.94 +++ Changes 25 Feb 2004 02:27:33 - 1.95 @@ -6,7 +6,7 @@ =over 3 -=item 1.08_dev +=item 1.08 - February 24, 2004 Instead of hard-coding listen directive to 127.0.0.1, use the server name. [Gozer]
