Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@httpd.apache.org
Date: 23 May 2002 00:50:26 -0000
Message-ID: <20020523005026.95339.qmail@icarus.apache.org>
From: dougm@apache.org
To: httpd-test-cvs@apache.org
Subject: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
 TestBuild.pm

dougm       02/05/22 17:50:26

  Modified:    perl-framework/Apache-Test/lib/Apache TestBuild.pm
  Log:
  add min/most module config flavors
  
  Revision  Changes    Path
  1.3       +34 -1     httpd-test/perl-framework/Apache-Test/lib/Apache/TestBuild.pm
  
  Index: TestBuild.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestBuild.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestBuild.pm	16 Apr 2002 01:33:38 -0000	1.2
  +++ TestBuild.pm	23 May 2002 00:50:26 -0000	1.3
  @@ -13,11 +13,26 @@
   
   use constant DRYRUN => 0;
   
  +my @min_modules = qw(access auth log-config env mime setenvif
  +                     mime autoindex dir alias);
  +
  +my %shared_modules = (
  +    min  => join(' ', @min_modules),
  +);
  +
   my %configs = (
       all => {
           'apache-1.3' => [],
           'httpd-2.0' => enable20(qw(modules=all proxy)),
       },
  +    most => {
  +        'apache-1.3' => [],
  +        'httpd-2.0' => enable20(qw(modules=most)),
  +    },
  +    min => {
  +        'apache-1.3' => [],
  +        'httpd-2.0' => enable20(@min_modules),
  +    },
       exp => {
           'apache-1.3' => [],
           'httpd-2.0' => enable20(qw(example case_filter
  @@ -47,7 +62,19 @@
        shared => {
            config =>  {
                'apache-1.3' => [],
  -             'httpd-2.0'  => [qw(--enable-mods-shared=all)],
  +             'httpd-2.0'  => enable20_shared('all'),
  +         },
  +     },
  +     mostshared => {
  +         config =>  {
  +             'apache-1.3' => [],
  +             'httpd-2.0'  => enable20_shared('most'),
  +         },
  +     },
  +     minshared => {
  +         config =>  {
  +             'apache-1.3' => [],
  +             'httpd-2.0'  => enable20_shared('min'),
            },
        },
        static => {
  @@ -65,6 +92,12 @@
   
   sub enable20 {
       [ map { "--enable-$_" } @_ ];
  +}
  +
  +sub enable20_shared {
  +    my $name = shift;
  +    my $modules = $shared_modules{$name} || $name;
  +    enable20(qq(mods-shared="$modules"));
   }
   
   sub default_mpms {