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

[geoff]

geoff       2004/02/26 07:28:12

  Modified:    perl-framework/Apache-Test Changes
               perl-framework/Apache-Test/lib/Apache TestServer.pm
  Log:
  change -DAPACHE1 (and like defines) to -D APACHE1 to fix Win32
  compatibility issues [Steve Hay]
  
  Revision  Changes    Path
  1.98      +3 -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.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- Changes   25 Feb 2004 21:33:45 -0000      1.97
  +++ Changes   26 Feb 2004 15:28:11 -0000      1.98
  @@ -8,6 +8,9 @@
   
   =item 1.09-dev
   
  +change -DAPACHE1 (and like defines) to -D APACHE1 to fix Win32
  +compatibility issues [Steve Hay]
  +
   fix the custom config use for Apache-Test's own upgrades [Stas]
   
   =item 1.08 - February 24, 2004
  
  
  
  1.77      +5 -5      
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.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- TestServer.pm     24 Feb 2004 01:00:09 -0000      1.76
  +++ TestServer.pm     26 Feb 2004 15:28:12 -0000      1.77
  @@ -77,7 +77,7 @@
   
   sub dversion {
       my $self = shift;
  -    "-DAPACHE$self->{rev}";
  +    "-D APACHE$self->{rev}";
   }
   
   sub config_defines {
  @@ -87,11 +87,11 @@
   
       for my $item (qw(useithreads)) {
           next unless $Config{$item} and $Config{$item} eq 'define';
  -        push @defines, "-DPERL_\U$item";
  +        push @defines, "-D PERL_\U$item";
       }
   
       if (my $defines = $self->{config}->{vars}->{defines}) {
  -        push @defines, map { "-D$_" } split " ", $defines;
  +        push @defines, map { "-D $_" } split " ", $defines;
       }
   
       "@defines";
  @@ -106,11 +106,11 @@
       "-d $vars->{serverroot} -f $vars->{t_conf_file} $dversion $defines";
   }
   
  -my %one_process = (1 => '-X', 2 => '-DONE_PROCESS');
  +my %one_process = (1 => '-X', 2 => '-D ONE_PROCESS');
   
   sub start_cmd {
       my $self = shift;
  -    #XXX: threaded mpm does not respond to SIGTERM with -DONE_PROCESS
  +    #XXX: threaded mpm does not respond to SIGTERM with -D ONE_PROCESS
       my $args = $self->args;
       return "$self->{config}->{vars}->{httpd} $args";
   }