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 1999/01/22 03:56:32 UTC
cvs commit: modperl/t TEST
dougm 99/01/21 18:56:32
Modified: . Changes Makefile.PL
t TEST
Log:
make sure server is up before runtests()
Revision Changes Path
1.253 +2 -1 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- Changes 1999/01/21 00:38:20 1.252
+++ Changes 1999/01/22 02:56:30 1.253
@@ -421,7 +421,8 @@
-move Apache::Server code from Apache.xs to Server.xs
-remove Apache::fork stuff
-remove max_request_per_client method (use Apache::Globals instead)
-
+ -make sure server is up before runtests()
+
=item 1.15 - July 24, 1998
new experimental XS implementation of Apache::PerlRun/Apache::Registry
1.123 +1 -1 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- Makefile.PL 1999/01/19 20:56:52 1.122
+++ Makefile.PL 1999/01/22 02:56:30 1.123
@@ -149,7 +149,7 @@
$PERL_EXTRA_CFLAGS = "";
$SSLCacheServerPort = 8539;
$SSL_BASE = "";
-$Port = 8529;
+$Port = $ENV{HTTP_PORT} || 8529;
#so Doug can 'make test' different-builds@sametime/samebox
if(!$Is_Win32 and $ENV{RANDOM_PORT} and $$ > 8000 and $$ < 30000) {
$PORT ||= $$;
1.8 +31 -0 modperl/t/TEST
Index: TEST
===================================================================
RCS file: /export/home/cvs/modperl/t/TEST,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TEST 1999/01/20 23:16:31 1.7
+++ TEST 1999/01/22 02:56:31 1.8
@@ -1,5 +1,8 @@
#!/usr/local/bin/perl
+$|++;
+use Config;
+
# First we check if we already are within the "t" directory
if (-d "t") {
# try to move into test directory
@@ -62,6 +65,34 @@
else {
push(@tests, <modules/*.t>, <internal/*.t>);
}
+}
+
+unshift @INC, '.';
+require Apache::test;
+Apache::test->import('simple_fetch');
+use subs 'simple_fetch';
+
+unless (simple_fetch "/") {
+ if ($^O eq "solaris" and $Config{myhostname} eq "ramona") {
+ print "go hang in the chill room $ENV{USER}, ramona is doggin...";
+ }
+ else {
+ print "still waiting for server to warm up...";
+ }
+ for (1..3) {
+ sleep 1;
+ if (simple_fetch "/") {
+ print "ok\n";
+ }
+ else {
+ print "...";
+ }
+ }
+}
+
+unless (simple_fetch "/") {
+ print "not ok\n";
+ die "server failed to start!";
}
runtests @tests;