perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: modperl-2.0/t/response/TestModperl merge.pm
Date Thu, 12 Feb 2004 20:32:56 GMT
geoff       2004/02/12 12:32:56

  Modified:    t/response/TestModperl merge.pm
  Log:
  fix spacing
  
  Revision  Changes    Path
  1.3       +56 -65    modperl-2.0/t/response/TestModperl/merge.pm
  
  Index: merge.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- merge.pm	12 Feb 2004 02:12:47 -0000	1.2
  +++ merge.pm	12 Feb 2004 20:32:56 -0000	1.3
  @@ -23,68 +23,59 @@
   # the keys to the main hash represent merge levels - 1 for the non-overriding
   # merge, 2 for an overriding merge, and 3 for a two-level merge
   # the rest should be self-explanatory - settings and expected values.
  -our %merge1 = ( 1 =>
  -                  { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  -                    PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  -                    PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  -                    PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  -                                                     'AddVar1Val2']],
  -                  },
  -                2 =>
  -                  { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Val'],
  -                    PerlSetVar  => [MergeSetVar2 => 'SetVar2Val'],
  -                    PerlAddVar  => [MergeAddVar2 => ['AddVar2Val1', 
  -                                                     'AddVar2Val2']],
  -                  },
  -                3 =>
  -                  { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Val'],
  -                    PerlSetVar  => [MergeSetVar3 => 'SetVar3Val'],
  -                    PerlAddVar  => [MergeAddVar3 => ['AddVar3Val1',
  -                                                     'AddVar3Val2']],
  -                  },
  -             );
  -
  -our %merge2 = ( 1 => 
  -                  { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  -                    PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  -                    PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  -                    PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  -                                                     'AddVar1Val2']],
  -                  },
  -                2 =>
  -                  { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
  -                    PerlSetVar  => [MergeSetVar2 => 'SetVar2Merge2Val'],
  -                    PerlAddVar  => [MergeAddVar2 => ['AddVar2Merge2Val1',
  -                                                     'AddVar2Merge2Val2']],
  -                  },
  -                3 =>
  -                  { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Val'],
  -                    PerlSetVar  => [MergeSetVar3 => 'SetVar3Val'],
  -                    PerlAddVar  => [MergeAddVar3 => ['AddVar3Val1',
  -                                                     'AddVar3Val2']],
  -                  },
  -             );
  -
  -our %merge3 = ( 1 => 
  -                  { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  -                    PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  -                    PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  -                    PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  -                                                     'AddVar1Val2']],
  -                  },
  -                2 =>
  -                  { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
  -                    PerlSetVar  => [MergeSetVar2 => 'SetVar2Merge2Val'],
  -                    PerlAddVar  => [MergeAddVar2 => ['AddVar2Merge2Val1',
  -                                                     'AddVar2Merge2Val2']],
  -                  },
  -                3 =>
  -                  { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Merge3Val'],
  -                    PerlSetVar  => [MergeSetVar3 => 'SetVar3Merge3Val'],
  -                    PerlAddVar  => [MergeAddVar3 => ['AddVar3Merge3Val1',
  -                                                     'AddVar3Merge3Val2']],
  -                  },
  -             );
  +our %merge1 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  +                       PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  +                       PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  +                       PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  +                                                        'AddVar1Val2']],
  +                     },
  +                2 => { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Val'],
  +                       PerlSetVar  => [MergeSetVar2 => 'SetVar2Val'],
  +                       PerlAddVar  => [MergeAddVar2 => ['AddVar2Val1', 
  +                                                        'AddVar2Val2']],
  +                     },
  +                3 => { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Val'],
  +                       PerlSetVar  => [MergeSetVar3 => 'SetVar3Val'],
  +                       PerlAddVar  => [MergeAddVar3 => ['AddVar3Val1',
  +                                                        'AddVar3Val2']],
  +                     },
  +              );
  +
  +our %merge2 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  +                       PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  +                       PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  +                       PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  +                                                        'AddVar1Val2']],
  +                     },
  +                2 => { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
  +                       PerlSetVar  => [MergeSetVar2 => 'SetVar2Merge2Val'],
  +                       PerlAddVar  => [MergeAddVar2 => ['AddVar2Merge2Val1',
  +                                                        'AddVar2Merge2Val2']],
  +                     },
  +                3 => { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Val'],
  +                       PerlSetVar  => [MergeSetVar3 => 'SetVar3Val'],
  +                       PerlAddVar  => [MergeAddVar3 => ['AddVar3Val1',
  +                                                        'AddVar3Val2']],
  +                     },
  +              );
  +
  +our %merge3 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
  +                       PerlSetEnv  => [MergeSetEnv1 => 'SetEnv1Val'],
  +                       PerlSetVar  => [MergeSetVar1 => 'SetVar1Val'],
  +                       PerlAddVar  => [MergeAddVar1 => ['AddVar1Val1', 
  +                                                        'AddVar1Val2']],
  +                     },
  +                2 => { PerlSetEnv  => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
  +                       PerlSetVar  => [MergeSetVar2 => 'SetVar2Merge2Val'],
  +                       PerlAddVar  => [MergeAddVar2 => ['AddVar2Merge2Val1',
  +                                                        'AddVar2Merge2Val2']],
  +                     },
  +                3 => { PerlSetEnv  => [MergeSetEnv3 => 'SetEnv3Merge3Val'],
  +                       PerlSetVar  => [MergeSetVar3 => 'SetVar3Merge3Val'],
  +                       PerlAddVar  => [MergeAddVar3 => ['AddVar3Merge3Val1',
  +                                                        'AddVar3Merge3Val2']],
  +                     },
  +              );
   
   sub handler {
   
  @@ -98,11 +89,11 @@
       my $hash;
   
       if ($location =~ m/(merge3)/) {
  -      $hash = $1;
  +        $hash = $1;
       } elsif ($location =~ m/(merge2)/) {
  -      $hash = $1;
  +        $hash = $1;
       } else {
  -      $hash = 'merge1'; 
  +        $hash = 'merge1'; 
       }
   
       t_debug("testing against results in $hash");
  
  
  

Mime
View raw message