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 16:36:30 UTC
cvs commit: modperl/t/conf httpd.conf-dist httpd.conf-win32
dougm 98/07/23 07:36:30
Modified: . Changes Makefile.PL SUPPORT ToDo
t TEST TEST.win32
t/conf httpd.conf-dist httpd.conf-win32
Log:
move /tmp/mod_perl_* to t/logs, t/conf
Revision Changes Path
1.90 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Changes 1998/07/23 13:16:22 1.89
+++ Changes 1998/07/23 14:36:24 1.90
@@ -8,6 +8,8 @@
=item 1.14_01-dev
+move /tmp/mod_perl_* to t/logs, t/conf
+
alias Apache::Util unescape_uri -> Apache::unescape_url
alias Apache::Log emerg -> emergency, crit -> critical
1.76 +18 -12 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Makefile.PL 1998/07/23 02:59:33 1.75
+++ Makefile.PL 1998/07/23 14:36:25 1.76
@@ -93,8 +93,10 @@
chmod 0644, "t/conf/mod_perl_srm.conf";
+mkdir "t/logs", 0777;
+chmod 0777, "t/logs";
+
unless ($Is_Win32) {
- mkdir "t/logs", 0755;
system "chmod a+x t/net/perl/* t/net/perl/io/*";
}
@@ -107,9 +109,9 @@
Apache/Apache.xs
Constants/Constants.xs
t/modules/ssi.t
- /tmp/mod_perl_error_log
- /tmp/mod_perl_srm.conf
- /tmp/mod_perl_httpd.pid
+ t/logs/mod_perl_error_log
+ t/conf/srm.conf
+ t/logs/mod_perl_httpd.pid
};
#t/conf/httpd.conf
#t/net/config.pl
@@ -150,6 +152,10 @@
$PERL_EXTRA_CFLAGS = "";
$SSLCacheServerPort = 8539;
$Port = 8529;
+#so Doug can 'make test' different-builds@sametime/samebox
+if(!Is_Win32 and $Is_dougm and $$ > 8000 and $$ < 30000) {
+ $PORT ||= $$;
+}
$PORT ||= $Port;
$DO_HTTPD = $ENV{DO_HTTPD} || 0;
$NO_HTTPD = $ENV{NO_HTTPD} || 0;
@@ -707,7 +713,7 @@
if($callback_hooks{PERL_TRANS}) {
push @test_pre_init,
- "\t", '$(CP) t/conf/mod_perl_srm.conf /tmp', "\n";
+ "\t", '$(CP) t/conf/mod_perl_srm.conf t/conf/srm.conf', "\n";
}
unless ($USE_APXS) {
unless (-l "t/httpd") {
@@ -1167,19 +1173,19 @@
TEST_VERBOSE=0
kill_httpd:
- kill `cat /tmp/mod_perl_httpd.pid`
- @$(RM_F) /tmp/mod_perl_srm.conf
- @$(RM_F) /tmp/mod_perl.lock.*
- $(RM_F) /tmp/mod_perl_httpd.pid
- $(RM_F) /tmp/mod_perl_error_log
+ 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_httpd.pid
+ $(RM_F) t/logs/mod_perl_error_log
start_httpd: test_pre_init
@(cd t/conf; test -f httpd.conf || cp httpd.conf-dist httpd.conf)
@(cd t/net; test -f config.pl || cp config.pl.dist config.pl)
- @$(TOUCH) /tmp/mod_perl_srm.conf
+ @$(TOUCH) t/conf/srm.conf
$(APACHE_SRC)/$(HTTPD) -f `pwd`/t/conf/httpd.conf -X -d `pwd`/t &
@echo httpd listening on port $(PORT)
- @echo will write error_log to: /tmp/mod_perl_error_log
+ @echo will write error_log to: t/logs/mod_perl_error_log
@echo "letting apache warm up...\c"
@sleep 2
@echo done
1.7 +1 -1 modperl/SUPPORT
Index: SUPPORT
===================================================================
RCS file: /export/home/cvs/modperl/SUPPORT,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SUPPORT 1998/06/09 12:41:27 1.6
+++ SUPPORT 1998/07/23 14:36:25 1.7
@@ -69,7 +69,7 @@
Server configuration details
-relevant sections of /tmp/mod_perl_error_log or logs/error_log
+relevant sections of t/logs/mod_perl_error_log or logs/error_log
If 'make test' fails, the output of 'make test TEST_VERBOSE=1'
1.52 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ToDo 1998/07/23 13:16:24 1.51
+++ ToDo 1998/07/23 14:36:25 1.52
@@ -16,8 +16,6 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
-- move /tmp/mod_perl_* to t/logs
-
- add $r->get_server_port method
- /perl/perl-status?sig dumps core under hpux 10.20
1.4 +7 -1 modperl/t/TEST
Index: TEST
===================================================================
RCS file: /export/home/cvs/modperl/t/TEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TEST 1998/05/08 02:40:50 1.3
+++ TEST 1998/07/23 14:36:28 1.4
@@ -32,7 +32,13 @@
#shutdown httpd before make aborts
$SIG{'__DIE__'} = sub {
return unless $_[0] =~ /^Failed/i;
- system "kill `cat /tmp/mod_perl_httpd.pid`";
+ my $el = "../logs/mod_perl_httpd.pid";
+ if(-e $el) {
+ system "kill `cat $el`";
+ }
+ else {
+ warn "can't stat $el $!\n";
+ }
warn "httpd terminated\n";
};
1.3 +9 -10 modperl/t/TEST.win32
Index: TEST.win32
===================================================================
RCS file: /export/home/cvs/modperl/t/TEST.win32,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TEST.win32 1998/03/24 04:19:54 1.2
+++ TEST.win32 1998/07/23 14:36:28 1.3
@@ -89,17 +89,16 @@
#
-
mkdir("/tmp","755") unless -d "/tmp";
-
-open(BROL, ">/tmp/mod_perl_srm.conf"); close BROL;
-
-open(BROL, ">/tmp/mod_perl_access.conf"); close BROL;
-open(BROL, ">/tmp/mod_perl_mime.types"); close BROL;
-
-
-#
+for my $d (qw(logs conf)) {
+ mkdir("t/$d","755") unless -d "t/$d";
+}
+
+for my $f (qw(srm.conf access.conf mime.types)) {
+ local *FH;
+ open FH, ">t/conf/$f"; close FH;
+}
# change the paths so everybody agrees on which files to use
@@ -136,7 +135,7 @@
print "httpd listening on port $port\n";
-print "will write error_log to: /tmp/mod_perl_error_log\n";
+print "will write error_log to: t/logs/mod_perl_error_log\n";
print "letting apache warm up...\n";
1.9 +3 -3 modperl/t/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-dist,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- httpd.conf-dist 1998/07/22 22:59:35 1.8
+++ httpd.conf-dist 1998/07/23 14:36:29 1.9
@@ -107,10 +107,10 @@
#end mod_perl stuff
-ErrorLog /tmp/mod_perl_error_log
-PidFile /tmp/mod_perl_httpd.pid
+ErrorLog logs/mod_perl_error_log
+PidFile logs/mod_perl_httpd.pid
AccessConfig /dev/null
-ResourceConfig /tmp/mod_perl_srm.conf
+ResourceConfig conf/srm.conf
TypesConfig /dev/null
TransferLog /dev/null
ScoreBoardFile /dev/null
1.5 +7 -13 modperl/t/conf/httpd.conf-win32
Index: httpd.conf-win32
===================================================================
RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-win32,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.conf-win32 1998/07/13 00:11:44 1.4
+++ httpd.conf-win32 1998/07/23 14:36:29 1.5
@@ -123,25 +123,19 @@
#
-# let all bogus and temporary files start with /tmp/mod_perl_
+ErrorLog logs/mod_perl_error_log
-# to keep the entropy rise minimal
+PidFile logs/mod_perl_httpd.pid
-#
+AccessConfig conf/access.conf
-ErrorLog /tmp/mod_perl_error_log
+ResourceConfig conf/srm.conf
-PidFile /tmp/mod_perl_httpd.pid
+TypesConfig conf/mime.types
-AccessConfig /tmp/mod_perl_access.conf
+TransferLog logs/xferlog
-ResourceConfig /tmp/mod_perl_srm.conf
-
-TypesConfig /tmp/mod_perl_mime.types
-
-TransferLog /tmp/mod_perl_xferlog
-
-ScoreBoardFile /tmp/mod_perl_scoreboard
+ScoreBoardFile logs/scoreboard
AddType text/x-server-parsed-html .shtml