cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestServer.pm

[stas]

stas        2002/07/01 01:11:50

  Modified:    perl-framework/Apache-Test/lib/Apache TestServer.pm
  Log:
  since currently the non-COLOR mode is the default and mostly used by
  interactive start-ups, return the indication of waiting by simply printing
  . per sec we waited. this shouldn't interfere with batch runs, while
  telling the interactive users that things are ok
  
  Revision  Changes    Path
  1.60      +8 -6      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
  
  Index: TestServer.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- TestServer.pm     23 Apr 2002 15:58:03 -0000      1.59
  +++ TestServer.pm     1 Jul 2002 08:11:50 -0000       1.60
  @@ -465,11 +465,12 @@
   
       my $start_time = time;
       my $preamble = "${CTRL_M}waiting for server to start: ";
  +    print $preamble unless COLOR;
       while (1) {
           my $delta = time - $start_time;
  -        if (COLOR) {
  -            print $preamble, sprintf "%02d:%02d", (gmtime $delta)[1,0];
  -        }
  +        print COLOR
  +            ? ($preamble, sprintf "%02d:%02d", (gmtime $delta)[1,0])
  +            : '.';
           sleep 1;
           if ($self->pid) {
               print $preamble, "ok (waited $delta secs)\n";
  @@ -532,11 +533,12 @@
   
       my $start_time = time;
       my $preamble = "${CTRL_M}still waiting for server to warm up: ";
  +    print $preamble unless COLOR;
       while (1) {
           my $delta = time - $start_time;
  -        if (COLOR) {
  -            print $preamble, sprintf "%02d:%02d", (gmtime $delta)[1,0];
  -        }
  +        print COLOR
  +            ? ($preamble, sprintf "%02d:%02d", (gmtime $delta)[1,0])
  +            : '.';
           sleep $sleep_interval;
           if ($server_up->()) {
               print "${CTRL_M}the server is up (waited $delta secs)            
 \n";