You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by ge...@apache.org on 2004/02/21 00:51:54 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestServer.pm
geoff 2004/02/20 15:51:54
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestServer.pm
Log:
added -defines configuration option, providing a way to pass additional
-D names to the server for use in <IfDefine> blocks.
Revision Changes Path
1.93 +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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- Changes 19 Feb 2004 06:37:20 -0000 1.92
+++ Changes 20 Feb 2004 23:51:54 -0000 1.93
@@ -8,6 +8,9 @@
=item 1.08_dev
+added -defines configuration option, providing a way to pass additional
+-D names to the server for use in <IfDefine> blocks. [Geoffrey Young]
+
Make it possible to run TEST (or another driving script) from any path
(e.g. t/TEST, ./TEST, /full/path/to/t/TEST) [Stas]
1.209 +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.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- TestConfig.pm 19 Feb 2004 06:36:34 -0000 1.208
+++ TestConfig.pm 20 Feb 2004 23:51:54 -0000 1.209
@@ -64,6 +64,7 @@
sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
sslcaorg => 'SSL CA organization to use for tests (default is asf)',
libmodperl => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)',
+ defines => 'values to add as -D defines (for example, "VAR1 VAR2")',
(map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth)),
);
@@ -254,6 +255,7 @@
$vars->{maxclients} ||= 1;
$vars->{proxy} ||= 'off';
$vars->{proxyssl_url} ||= '';
+ $vars->{defines} ||= '';
$self->configure_apxs;
$self->configure_httpd;
1.75 +2 -0 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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- TestServer.pm 30 Nov 2003 21:29:49 -0000 1.74
+++ TestServer.pm 20 Feb 2004 23:51:54 -0000 1.75
@@ -88,6 +88,8 @@
push @defines, "-DPERL_\U$item";
}
+ push @defines, map { "-D$_" } split " ", shift->{config}->{vars}->{defines};
+
"@defines";
}