You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/07/23 17:01:00 UTC
cvs commit: modperl/t TEST
dougm 98/07/23 08:00:59
Modified: . Makefile.PL
t TEST
Log:
minor fixups for last set of changes
Revision Changes Path
1.77 +2 -2 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Makefile.PL 1998/07/23 14:36:25 1.76
+++ Makefile.PL 1998/07/23 15:00:57 1.77
@@ -837,7 +837,7 @@
my $v = httpd_version($APACHE_SRC, 1);
my $mmn = magic_number($APACHE_SRC) || 0;
- conf_append("LockFile /tmp/mod_perl.lock") if $v >= 121;
+ conf_append("LockFile logs/mod_perl.lock") if $v >= 121 or $mmn >= MMN_130;
conf_append("PerlChildInitHandler My::child_init") if $My::child_init;
conf_append("PerlChildExitHandler My::child_exit") if $My::child_exit;
conf_append("PerlTransHandler My::ProxyTest")
@@ -1175,7 +1175,7 @@
kill_httpd:
kill `cat t/logs/mod_perl_httpd.pid`
@$(RM_F) t/conf/srm.conf
- @$(RM_F) t/logs/mod_perl.lock.*
+ @$(RM_F) t/logs/mod_perl.lock*
$(RM_F) t/logs/mod_perl_httpd.pid
$(RM_F) t/logs/mod_perl_error_log
1.5 +1 -1 modperl/t/TEST
Index: TEST
===================================================================
RCS file: /export/home/cvs/modperl/t/TEST,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TEST 1998/07/23 14:36:28 1.4
+++ TEST 1998/07/23 15:00:59 1.5
@@ -32,7 +32,7 @@
#shutdown httpd before make aborts
$SIG{'__DIE__'} = sub {
return unless $_[0] =~ /^Failed/i;
- my $el = "../logs/mod_perl_httpd.pid";
+ my $el = "../t/logs/mod_perl_httpd.pid";
if(-e $el) {
system "kill `cat $el`";
}