cvs commit: modperl/t TEST.win32

[randyk]

randyk      2003/07/12 16:25:50

  Modified:    t        TEST.win32
  Log:
  Some cleanup in starting and stopping server, and also unlink pid file.
  
  Revision  Changes    Path
  1.8       +11 -8     modperl/t/TEST.win32
  
  Index: TEST.win32
  ===================================================================
  RCS file: /home/cvs/modperl/t/TEST.win32,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TEST.win32        12 Jul 2003 23:22:59 -0000      1.7
  +++ TEST.win32        12 Jul 2003 23:25:50 -0000      1.8
  @@ -94,29 +94,30 @@
   # start ourselves a server to pound on
   #
   
  +my $HttpdObj;
   Win32::Process::Create($HttpdObj,
                          $fullapache,
  -                       "$apache -X -d $pwd/t",
  +                       "$apache -X -d $pwd/t -f $pwd/t/conf/httpd.conf",
                          0,
                          NORMAL_PRIORITY_CLASS,
                          ".") || die ErrorReport();
   
  -print "httpd listening on port $port\n";
  -print "will write error_log to: t/logs/mod_perl_error_log\n";
  -print "letting apache warm up...\n";
  +print << "END";
  +httpd listening on port $port
  +will write error_log to: t/logs/mod_perl_error_log
  +letting apache warm up...
  +END
  +
   sleep 2;
   print "done\n";
   
   #
   # Ok, start pounding
   #
  -
   system "$fullperl t/TEST @ARGV";
   
  -#
   # stop server again
  -#
  -$HttpdObj->Kill(-1);
  +$HttpdObj->Kill(0);
   
   #
   # remove traces
  @@ -126,6 +127,8 @@
   sleep 2;
   find(\&cleanup, '/tmp/');
   sub cleanup {/^(mod_perl|CGItemp)/ && unlink($_)}
  +unlink $bak;
  +unlink "$pwd/t/logs/mod_perl_httpd.pid";
   
   sub find_apache {
     my $apache;