joes 2002/11/17 15:18:04
Modified: . Makefile.PL
Log:
Base libapreq-1.x tests on Apache::test, not Apache::Test (which seems to be
for testing 2.x).
Revision Changes Path
1.12 +30 -20 httpd-apreq/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Makefile.PL,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.PL 5 Apr 2002 19:43:07 -0000 1.11
+++ Makefile.PL 17 Nov 2002 23:18:04 -0000 1.12
@@ -2,28 +2,15 @@
use strict;
use 5.005;
-use lib qw(Apache-Test/lib);
-use constant HAS_APACHE_TEST => eval {require Apache::Test};
-# enable 'make test|clean'
-if (HAS_APACHE_TEST) {
- require Apache::TestMM;
- Apache::TestMM->import(qw(test clean));
-}
-
+use Apache::test;
+my %params = Apache::test->get_test_params();
+Apache::test->write_httpd_conf(%params, include => join '', <DATA>);
+*MY::test = sub {Apache::test->MM_test(%params)};
# prerequisites
my %require = (
- "Apache::Test" => "", # any version will do
+ "Apache::test" => "", # any version will do
);
-my @scripts = ();
-
-if (HAS_APACHE_TEST) {
- # accept the configs from command line
- Apache::TestMM::filter_args();
- Apache::TestMM::generate_script('t/TEST');
- push @scripts, 't/TEST';
-}
-
my $myVERSION = MM->parse_version('Request/Request.pm');
$myVERSION =~ s/(\d\d)(\d\d)$/$1_$2/;
my $Is_Win32 = ($^O eq "MSWin32") || $ENV{WIN32_TEST};
@@ -72,7 +59,7 @@
);
sub clean_files {
- return [EMAIL PROTECTED];
+ return [qw( t/httpd.conf t/httpd.loc t/error_log t/httpd )];
}
if ($Is_Win32 and -e $lib) {
@@ -107,5 +94,28 @@
@echo update the VERSION in Apache/Request.pm now
EOF
-}
+}
+__DATA__
+<Perl>
+ push @INC, "blib/arch";
+</Perl>
+PerlModule Apache::PerlRun
+PerlModule Apache::Request
+PerlModule Apache::Cookie
+
+<FilesMatch "\.pl">
+ SetHandler perl-script
+ PerlHandler Apache::PerlRun
+ Options +ExecCGI
+</FilesMatch>
+
+
+
+
+
+
+
+
+
+
