httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm TestBuild.pm TestConfig.pm TestMB.pm TestMM.pm TestReport.pm TestRun.pm TestSmoke.pm
Date Sat, 07 Aug 2004 02:56:27 GMT
stas        2004/08/06 19:56:27

  Modified:    perl-framework/Apache-Test/lib/Apache Test.pm TestBuild.pm
                        TestConfig.pm TestMB.pm TestMM.pm TestReport.pm
                        TestRun.pm TestSmoke.pm
  Log:
  add basic_config wrapper, which gets the config object w/o trying to find
  httpd (otherwise interactive config was popping up at 'perl Makefile.PL'
  phase, which is too early
  
  Revision  Changes    Path
  1.95      +5 -0      httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
  
  Index: Test.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -u -r1.94 -r1.95
  --- Test.pm	7 Aug 2004 02:21:47 -0000	1.94
  +++ Test.pm	7 Aug 2004 02:56:26 -0000	1.95
  @@ -57,6 +57,11 @@
       $Config ||= Apache::TestConfig->thaw;
   }
   
  +# doesn't require httpd to be found
  +sub basic_config {
  +    $Config ||= Apache::TestConfig->thaw(no_httpd_config => 1);
  +}
  +
   sub vars {
       @_ ? @{ config()->{vars} }{ @_ } : config()->{vars};
   }
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- TestBuild.pm	4 Mar 2004 05:51:31 -0000	1.4
  +++ TestBuild.pm	7 Aug 2004 02:56:26 -0000	1.5
  @@ -604,7 +604,7 @@
   
       my $content = join '', <DATA>;
   
  -    Apache::Test::config()->write_perlscript($file, $content);
  +    Apache::Test::basic_config()->write_perlscript($file, $content);
   }
   
   unless (caller) {
  
  
  
  1.234     +3 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.233
  retrieving revision 1.234
  diff -u -u -r1.233 -r1.234
  --- TestConfig.pm	6 Aug 2004 21:43:22 -0000	1.233
  +++ TestConfig.pm	7 Aug 2004 02:56:26 -0000	1.234
  @@ -193,8 +193,10 @@
       # httpd-independent components
       my $self = $class->new_common(@_);
   
  +    my $vars = $self->{vars};
  +
       # components requiring httpd knowledge
  -    $self->httpd_config;
  +    $self->httpd_config unless $vars->{no_httpd_config};
   
       $self;
   }
  
  
  
  1.6       +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestMB.pm
  
  Index: TestMB.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMB.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- TestMB.pm	9 Jul 2004 20:01:26 -0000	1.5
  +++ TestMB.pm	7 Aug 2004 02:56:26 -0000	1.6
  @@ -136,7 +136,7 @@
   
       # Make it so!
       print "Generating test running script $script\n" if $self->verbose;
  -    Apache::Test::config()->write_perlscript($script, $body);
  +    Apache::Test::basic_config()->write_perlscript($script, $body);
       $self->add_to_cleanup($self->apache_test_script);
   }
   
  
  
  
  1.36      +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm
  
  Index: TestMM.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -u -r1.35 -r1.36
  --- TestMM.pm	28 Jul 2004 21:58:53 -0000	1.35
  +++ TestMM.pm	7 Aug 2004 02:56:26 -0000	1.36
  @@ -105,7 +105,7 @@
       close $in;
   
       info "generating script $file";
  -    Apache::Test::config()->write_perlscript($file, $body);
  +    Apache::Test::basic_config()->write_perlscript($file, $body);
   }
   
   sub filter_args {
  
  
  
  1.13      +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestReport.pm
  
  Index: TestReport.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestReport.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- TestReport.pm	4 Mar 2004 05:51:31 -0000	1.12
  +++ TestReport.pm	7 Aug 2004 02:56:26 -0000	1.13
  @@ -41,7 +41,7 @@
           "use $class;",
           "$class->new(\@ARGV)->run;";
   
  -    Apache::Test::config()->write_perlscript($file, $content);
  +    Apache::Test::basic_config()->write_perlscript($file, $content);
   }
   
   sub replace {
  
  
  
  1.176     +4 -2      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.175
  retrieving revision 1.176
  diff -u -u -r1.175 -r1.176
  --- TestRun.pm	6 Aug 2004 21:43:22 -0000	1.175
  +++ TestRun.pm	7 Aug 2004 02:56:26 -0000	1.176
  @@ -736,6 +736,7 @@
   }
   
   sub rerun {
  +    $orig_cwd ||= Cwd::cwd();
       chdir $orig_cwd;
       warning "rerunning '$orig_command' with new config opts";
       exec $orig_command;
  @@ -1243,10 +1244,11 @@
           $body .= "\n\npackage $class;\n" .
                    "sub bug_report { print '$report' }\n\n";
       }
  -    
  +
       $body .= "$class->new->run(\@ARGV);";
   
  -    Apache::Test::config()->write_perlscript($opts{file}, $body);
  +    Apache::Test::basic_config()->write_perlscript($opts{file},
  +                                                   $body);
   }
   
   # in idiomatic perl functions return 1 on success and 0 on
  
  
  
  1.30      +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmoke.pm
  
  Index: TestSmoke.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestSmoke.pm,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -u -r1.29 -r1.30
  --- TestSmoke.pm	4 Mar 2004 05:51:31 -0000	1.29
  +++ TestSmoke.pm	7 Aug 2004 02:56:26 -0000	1.30
  @@ -759,7 +759,7 @@
           "use $class;",
           "$class->new(\@ARGV)->run;";
   
  -    Apache::Test::config()->write_perlscript($file, $content);
  +    Apache::Test::basic_config()->write_perlscript($file, $content);
   }
   
   1;
  
  
  

Mime
View raw message