richter 2004/08/16 23:34:35
Modified: . test.pl
test/conf httpd.min.conf.src
Log:
syntax check tests
Revision Changes Path
1.144 +27 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- test.pl 17 Aug 2004 06:17:58 -0000 1.143
+++ test.pl 17 Aug 2004 06:34:35 -0000 1.144
@@ -1669,6 +1669,28 @@
close SVLOG ;
}
+#########################
+
+
+sub run_check
+
+ {
+ my ($cmd, $cmp) = @_ ;
+
+
+ $cmd =~ s/\//\\/g if ($EPWIN32) ;
+
+
+ open STFH, "$cmd 2>&1 |" ;
+
+ my @x = <STFH> ;
+
+ close STFH ;
+
+ grep (/$cmp/, @x) or die "ERROR: $cmp not found\nGot @x\n" ;
+ print "ok\n" ;
+ }
+
######################### We start with some black magic to print on failure.
@@ -2502,10 +2524,10 @@
chmod 0666, $logfile ;
$XX = $opt_multchild && !($opt_gdb || $opt_ddd)?'':'-X' ;
- print "\n\nPerforming httpd syntax check 1 ...\n" ;
- $rc = system ("\"$EPHTTPD\" " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . "
-t -f \"$EPPATH/$httpdminconf\" ") ; #and die "***Cannot check syntax by $EPHTTPD
(rc=$rc)" ;
- print "\n\nPerforming httpd syntax check 2 ...\n" ;
- $rc = system ("\"$EPHTTPD\" " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . "
-t -f \"$EPPATH/$httpdconf\" ") ; #and die "***Cannot check syntax by $EPHTTPD
(rc=$rc)" ;
+ print "\n\nPerforming httpd syntax check 1 ... " ;
+ run_check ("\"$EPHTTPD\" " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . " -t
-f \"$EPPATH/$httpdminconf\" ", 'Syntax OK') ;
+ print "\n\nPerforming httpd syntax check 2 ... " ;
+ run_check ("\"$EPHTTPD\" " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . " -t
-f \"$EPPATH/$httpdconf\" ", 'Syntax OK') ;
print "\n\nStarting httpd... " ;
if ($EPWIN32)
1.2 +13 -2 embperl/test/conf/httpd.min.conf.src
Index: httpd.min.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.min.conf.src,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd.min.conf.src 17 Aug 2004 06:17:59 -0000 1.1
+++ httpd.min.conf.src 17 Aug 2004 06:34:35 -0000 1.2
@@ -10,7 +10,6 @@
#
# This file is automaticly generated each time you run make test/make start/make
stop
#
-ServerType standalone
HostnameLookups off
ServerAdmin webmaster
@@ -46,10 +45,22 @@
print OFH <<EOD ;
ErrorLog tmp/httpd.err.log
PidFile tmp/httpd.pid
+EOD
+
+if (!$MP2)
+
+ {
+
+print OFH <<EOD ;
AccessConfig conf/null
ResourceConfig conf/null
+EOD
+
+ }
+
+print OFH <<EOD ;
TypesConfig conf/null
LockFile tmp/httpd.lock
PerlRequire \"$EPPATH/test/conf/$minstartup\"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
