Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@httpd.apache.org
Date: 22 Sep 2004 23:14:30 -0000
Message-ID: <20040922231430.88578.qmail@minotaur.apache.org>
From: geoff@apache.org
To: httpd-test-cvs@apache.org
Subject: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
 TestRun.pm TestServer.pm

geoff       2004/09/22 16:14:30

  Modified:    perl-framework/Apache-Test Changes
               perl-framework/Apache-Test/lib/Apache TestRun.pm
                        TestServer.pm
  Log:
  add -one-process runtime argument, which will start the server
  in single-server mode (httpd -X in Apache 1.X or
  httpd -D ONE_PROCESS in 2.X)
  Reviewed by:	stas
  
  Revision  Changes    Path
  1.169     +4 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- Changes	21 Sep 2004 05:39:23 -0000	1.168
  +++ Changes	22 Sep 2004 23:14:29 -0000	1.169
  @@ -8,6 +8,10 @@
   
   =item 1.14-dev
   
  +add -one-process runtime argument, which will start the server
  +in single-server mode (httpd -X in Apache 1.X or 
  +httpd -D ONE_PROCESS in 2.X) [Geoffrey Young]
  +
   In open_cmd, sanitize PATH instead of clearing it [Gozer]
   
   Allow / \ and \\ path delimiters in SKIP file [Markus Wichitill
  
  
  
  1.183     +7 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- TestRun.pm	5 Sep 2004 00:11:30 -0000	1.182
  +++ TestRun.pm	22 Sep 2004 23:14:29 -0000	1.183
  @@ -48,7 +48,7 @@
   
   my @std_run      = qw(start-httpd run-tests stop-httpd);
   my @others       = qw(verbose configure clean help ssl http11 bugreport 
  -                      save no-httpd);
  +                      save no-httpd one-process);
   my @flag_opts    = (@std_run, @others);
   my @string_opts  = qw(order trace);
   my @ostring_opts = qw(proxy ping);
  @@ -89,6 +89,7 @@
      'trace=T'         => 'change tracing default to: warning, notice, ' .
                           'info, debug, ...',
      'save'            => 'save test paramaters into Apache::TestConfigData',
  +   'one-process'     => 'run the server in single process mode',
      (map { $_, "\U$_\E url" } @request_opts),
   );
   
  @@ -398,6 +399,7 @@
       $self->opt_clean(1);
       $self->{conf_opts}->{save} = delete $self->{conf_opts}->{thaw} || 1;
       $self->{test_config} = $self->new_test_config()->httpd_config;
  +    $self->{test_config}->{server}->{run} = $self;
       $self->{server} = $self->{test_config}->server;
   }
   
  @@ -690,6 +692,10 @@
       $self->{test_config} = $self->new_test_config();
   
       $self->warn_core();
  +
  +    # give TestServer access to our runtime configuration directives
  +    # so we can tell the server stuff if we need to
  +    $self->{test_config}->{server}->{run} = $self;
   
       $self->{server} = $self->{test_config}->server;
   
  
  
  
  1.86      +13 -3     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.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- TestServer.pm	6 Aug 2004 18:20:42 -0000	1.85
  +++ TestServer.pm	22 Sep 2004 23:14:29 -0000	1.86
  @@ -159,10 +159,20 @@
   my %one_process = (1 => '-X', 2 => '-D ONE_PROCESS');
   
   sub start_cmd {
  -    my $self = shift;
  +    my $self  = shift;
  +
  +    my $args   = $self->args;
  +    my $config = $self->{config};
  +    my $vars   = $config->{vars};
  +    my $httpd  = $vars->{httpd};
  +
  +    my $one_process = $self->{run}->{opts}->{'one-process'}
  +        ? $self->version_of(\%one_process)
  +        : '';
  +
       #XXX: threaded mpm does not respond to SIGTERM with -D ONE_PROCESS
  -    my $args = $self->args;
  -    return "$self->{config}->{vars}->{httpd} $args";
  +
  +    return "$httpd $one_process $args";
   }
   
   sub default_gdbinit {