stas 2002/12/13 02:08:09
Modified: t/response/TestDirective perlloadmodule3.pm
perlloadmodule4.pm perlloadmodule5.pm
perlloadmodule6.pm perlmodule.pm perlrequire.pm
Log:
The TestDirective tests are sensual to the order their configs are
inserted, start using the APACHE_TEST_CONFIG_ORDER ordering token with
them
Revision Changes Path
1.2 +2 -0 modperl-2.0/t/response/TestDirective/perlloadmodule3.pm
Index: perlloadmodule3.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule3.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perlloadmodule3.pm 12 Dec 2002 10:13:56 -0000 1.1
+++ perlloadmodule3.pm 13 Dec 2002 10:08:09 -0000 1.2
@@ -131,6 +131,8 @@
1;
__END__
+# APACHE_TEST_CONFIG_ORDER 950
+
<Base>
PerlLoadModule TestDirective::perlloadmodule3
MyPlus 5
1.2 +2 -0 modperl-2.0/t/response/TestDirective/perlloadmodule4.pm
Index: perlloadmodule4.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule4.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perlloadmodule4.pm 12 Dec 2002 10:13:56 -0000 1.1
+++ perlloadmodule4.pm 13 Dec 2002 10:08:09 -0000 1.2
@@ -77,6 +77,8 @@
1;
__END__
+# APACHE_TEST_CONFIG_ORDER 950
+
<Base>
PerlLoadModule TestDirective::perlloadmodule4
</Base>
1.2 +3 -0 modperl-2.0/t/response/TestDirective/perlloadmodule5.pm
Index: perlloadmodule5.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule5.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perlloadmodule5.pm 12 Dec 2002 10:13:56 -0000 1.1
+++ perlloadmodule5.pm 13 Dec 2002 10:08:09 -0000 1.2
@@ -75,6 +75,9 @@
1;
__END__
+
+# APACHE_TEST_CONFIG_ORDER 950
+
<Base>
PerlLoadModule TestDirective::perlloadmodule5
</Base>
1.2 +11 -0 modperl-2.0/t/response/TestDirective/perlloadmodule6.pm
Index: perlloadmodule6.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule6.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perlloadmodule6.pm 12 Dec 2002 10:13:56 -0000 1.1
+++ perlloadmodule6.pm 13 Dec 2002 10:08:09 -0000 1.2
@@ -65,6 +65,17 @@
1;
__END__
+# XXX: we want to have this configuration section to come first
+# amongst other perlloadmodule tests (<950), so we can test how
+# mod_perl starts from vhost. but currently we can't because
+# PerlSwitches from other tests are ignored, so the test suite fails
+# to startup.
+#
+# tmp solution: ensure that it's configured *after* all other
+# perlloadmodule tests
+#
+# APACHE_TEST_CONFIG_ORDER 951
+
<VirtualHost TestDirective::perlloadmodule6>
PerlLoadModule TestDirective::perlloadmodule6
MyTest6 "Vhost"
1.7 +3 -0 modperl-2.0/t/response/TestDirective/perlmodule.pm
Index: perlmodule.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlmodule.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perlmodule.pm 3 Dec 2002 15:28:52 -0000 1.6
+++ perlmodule.pm 13 Dec 2002 10:08:09 -0000 1.7
@@ -43,6 +43,9 @@
1;
__END__
+
+# APACHE_TEST_CONFIG_ORDER 940
+
<Base>
PerlSwitches -I@documentroot@/testdirective/perlmodule-vh
</Base>
1.10 +2 -0 modperl-2.0/t/response/TestDirective/perlrequire.pm
Index: perlrequire.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlrequire.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perlrequire.pm 3 Dec 2002 15:28:52 -0000 1.9
+++ perlrequire.pm 13 Dec 2002 10:08:09 -0000 1.10
@@ -54,6 +54,8 @@
1;
__END__
+# APACHE_TEST_CONFIG_ORDER 940
+
<Base>
PerlSwitches -I@documentroot@/testdirective/main
PerlRequire "ApacheTest/PerlRequireTest.pm"
