cvs commit: modperl-2.0/t/response/TestAPI module.pm

[stas]

stas        2004/04/07 18:56:31

  Modified:    t/response/TestAPI module.pm
  Log:
  mod_perl is no longer the last inserted, so it is not on the top of the
  module list
  
  Revision  Changes    Path
  1.9       +18 -9     modperl-2.0/t/response/TestAPI/module.pm
  
  Index: module.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- module.pm 1 Jul 2002 05:15:28 -0000       1.8
  +++ module.pm 8 Apr 2004 01:56:31 -0000       1.9
  @@ -18,31 +18,40 @@
   
       my $cfg = Apache::Test::config();
   
  -    plan $r, tests => 14;
  -
       my $top_module = Apache::Module->top_module;
   
  +    #no promise that mod_perl will be the top_module
  +    my $top_module_name = (defined $top_module && $top_module->name()) || '';
  +
  +    my $tests = 11;
  +    $tests += 3 if $top_module_name eq 'mod_perl.c';
  +
  +    plan $r, tests => $tests;
  +
  +    t_debug "top_module: $top_module_name";
       ok $top_module;
   
       ok t_cmp($cfg->{httpd_info}->{MODULE_MAGIC_NUMBER_MAJOR},
                $top_module->version,
                q{$top_module->version});
   
  -    ok t_cmp(scalar keys %{ $cfg->{modules} },
  +    ok t_cmp(scalar(keys %{ $cfg->{modules} }),
                $top_module->module_index,
  -             q{$top_module->module_index}) || 1;
  +             q{$top_module->module_index})
  +        || 1; # the A-T config could be wrong
   
       #XXX: some of these tests will fail if modperl is linked static
       #rather than dso.
   
  -    #no promise that mod_perl will be the top_module
  -    ok t_cmp('mod_perl.c', $top_module->name(), q{$top_module->name}) || 1;
  +    if ($top_module_name eq 'mod_perl.c') {
  +        ok t_cmp('mod_perl.c', $top_module_name, q{$top_module->name}) || 1;
   
  -    my $cmd = $top_module->cmds;
  +        my $cmd = $top_module->cmds;
   
  -    ok defined $cmd;
  +        ok defined $cmd;
   
  -    ok UNIVERSAL::isa($cmd, 'Apache::Command');
  +        ok UNIVERSAL::isa($cmd, 'Apache::Command');
  +    }
   
       if (0) { #XXX: currently fails with --enable-mods-shared=all
           local $cfg->{modules}->{'mod_perl.c'} = 1;