You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by st...@apache.org on 2003/09/11 04:12:50 UTC

cvs commit: httpd-test/perl-framework/Apache-Test Changes

stas        2003/09/10 19:12:50

  Modified:    perl-framework/Apache-Test/lib/Apache TestSmoke.pm
               perl-framework/Apache-Test Changes
  Log:
  Apache::TestSmoke now scans for core files, just like Apache::TestRun
  does
  
  Revision  Changes    Path
  1.21      +25 -5     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.20
  retrieving revision 1.21
  diff -u -u -r1.20 -r1.21
  --- TestSmoke.pm	14 May 2003 02:53:54 -0000	1.20
  +++ TestSmoke.pm	11 Sep 2003 02:12:50 -0000	1.21
  @@ -7,6 +7,8 @@
   use Apache::TestConfig ();
   use Apache::TestTrace;
   
  +use Apache::TestRun (); # for core scan functions
  +
   use Getopt::Long qw(GetOptions);
   use File::Spec::Functions qw(catfile);
   use FindBin;
  @@ -54,6 +56,8 @@
           total_tests_run           => 0,
       }, ref($class)||$class;
   
  +    $self->{test_config} = Apache::TestConfig->thaw;
  +
       $self->getopts(\@argv);
       my $opts = $self->{opts};
   
  @@ -114,6 +118,23 @@
       $self->{opts} = \%opts;
   }
   
  +sub install_sighandlers {
  +    my $self = shift;
  +
  +    $SIG{INT} = sub {
  +        $self->report_finish;
  +        exit;
  +    };
  +}
  +
  +END {
  +    local $?; # preserve the exit status
  +    eval {
  +        Apache::TestRun->new(test_config =>
  +                             Apache::TestConfig->thaw)->scan_core;
  +    };
  +}
  +
   
   sub run {
       my($self) = shift;
  @@ -121,6 +142,10 @@
       # make sure that there the server is down
       $self->kill_proc();
   
  +    $self->Apache::TestRun::warn_core();
  +    local $SIG{INT};
  +    $self->install_sighandlers;
  +
       $self->report_start();
       my $iter = 0;
       while ($iter++ < $self->{run_iter}) {
  @@ -336,11 +361,6 @@
   $self->{start_command}
   $sep
   EOM
  -
  -    $SIG{INT} = sub {
  -        $self->report_finish;
  -        exit;
  -    };
   
   }
   
  
  
  
  1.41      +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.40
  retrieving revision 1.41
  diff -u -u -r1.40 -r1.41
  --- Changes	12 Aug 2003 23:36:51 -0000	1.40
  +++ Changes	11 Sep 2003 02:12:50 -0000	1.41
  @@ -8,6 +8,9 @@
   
   =item 1.04-dev - 
   
  +Apache::TestSmoke now scans for core files, just like Apache::TestRun
  +does [Stas]
  +
   Allow the creation of name based virtual hosts by supplying
   <VirtualHost servername:module> containers in .conf.in$ files.
   [Andr� Malo]