module-build-checkins Mailing List for Module::Build (Page 10)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/module-build/Module-Build/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18712/t

Modified Files:
	ppm.t 
Log Message:
Only test files that are generated when manpages or HTML features are not enabled. Also, work around some idiosyncrasies with Archive::Tar on perl 5.005.

Index: ppm.t
===================================================================
RCS file: /cvsroot/module-build/Module-Build/t/ppm.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- ppm.t	2 Dec 2005 22:37:28 -0000	1.4
+++ ppm.t	4 Dec 2005 05:41:22 -0000	1.5
@@ -13,12 +13,16 @@
 
 use Module::Build;
 
-{ # Copied mostly verbatim from t/xs.t; should probably cache in t/common.pl
-  local $SIG{__WARN__} = sub {};
+my( $manpage_support, $HTML_support );
+
+{ local $SIG{__WARN__} = sub {};
 
   my $mb = Module::Build->current;
   $mb->verbose( 0 );
 
+  $manpage_support = $mb->feature('manpage_support');
+  $HTML_support    = $mb->feature('HTML_support');
+
   my $have_c_compiler;
   stderr_of( sub {$have_c_compiler = $mb->have_c_compiler} );
 
@@ -27,7 +31,9 @@
   } elsif ( ! $have_c_compiler ) {
     plan skip_all => 'C_support enabled, but no compiler found';
   } elsif ( ! eval {require Archive::Tar} ) {
-    plan skip_all => "Archive::Tar not installed; can't test archives.";
+    plan skip_all => "Archive::Tar not installed to read archives.";
+  } elsif ( ! eval {IO::Zlib->VERSION(1.01)} ) {
+    plan skip_all => "IO::Zlib 1.01 required to read compressed archives.";
   } else {
     plan tests => 12;
   }
@@ -82,10 +88,13 @@
 
   installdirs => 'site',
   config => {
-    installsiteman1dir  => catdir($tmp, 'site', 'man', 'man1'),
-    installsiteman3dir  => catdir($tmp, 'site', 'man', 'man3'),
-    installsitehtml1dir => catdir($tmp, 'site', 'html'),
-    installsitehtml3dir => catdir($tmp, 'site', 'html'),
+    manpage_reset(), html_reset(),
+    ( $manpage_support ?
+      ( installsiteman1dir  => catdir($tmp, 'site', 'man', 'man1'),
+        installsiteman3dir  => catdir($tmp, 'site', 'man', 'man3') ) : () ),
+    ( $HTML_support ?
+      ( installsitehtml1dir => catdir($tmp, 'site', 'html'),
+        installsitehtml3dir => catdir($tmp, 'site', 'html') ) : () ),
   },
 );
 
@@ -126,13 +135,25 @@
 my $tarfile = $mb->ppm_name . '.tar.gz';
 $tar->read( $tarfile, 1 );
 
-ok $tar->contains_file('blib/arch/auto/Simple/Simple.' . $mb->config('dlext'));
-ok $tar->contains_file('blib/lib/Simple.pm');
-ok $tar->contains_file('blib/script/hello');
-ok $tar->contains_file('blib/man3/Simple.' . $mb->config('man3ext'));
-ok $tar->contains_file('blib/man1/hello.' . $mb->config('man1ext'));
-ok $tar->contains_file('blib/html/site/lib/Simple.html');
-ok $tar->contains_file('blib/html/bin/hello.html');
+my $files = { map { $_ => 1 } $tar->list_files };
+
+exists_ok($files, 'blib/arch/auto/Simple/Simple.' . $mb->config('dlext'));
+exists_ok($files, 'blib/lib/Simple.pm');
+exists_ok($files, 'blib/script/hello');
+
+SKIP: {
+  skip( "manpage_support not enabled.", 2 ) unless $manpage_support;
+
+  exists_ok($files, 'blib/man3/Simple.' . $mb->config('man3ext'));
+  exists_ok($files, 'blib/man1/hello.' . $mb->config('man1ext'));
+}
+
+SKIP: {
+  skip( "HTML_support not enabled.", 2 ) unless $HTML_support;
+
+  exists_ok($files, 'blib/html/site/lib/Simple.html');
+  exists_ok($files, 'blib/html/bin/hello.html');
+}
 
 $tar->clear;
 undef( $tar );
@@ -141,33 +162,39 @@
 $dist->clean;
 
 
-# Make sure html documents are generated for the ppm distro even when
-# they would not be built during a normal build.
-$mb = Module::Build->new_from_context(
-  verbose => 0,
-  quiet   => 1,
+SKIP: {
+  skip( "HTML_support not enabled.", 3 ) unless $HTML_support;
 
-  installdirs => 'site',
-  config => {
-    html_reset(),
-    installsiteman1dir  => catdir($tmp, 'site', 'man', 'man1'),
-    installsiteman3dir  => catdir($tmp, 'site', 'man', 'man3'),
-  },
-);
+  # Make sure html documents are generated for the ppm distro even when
+  # they would not be built during a normal build.
+  $mb = Module::Build->new_from_context(
+    verbose => 0,
+    quiet   => 1,
 
-$mb->dispatch('ppmdist');
-is $@, '';
+    installdirs => 'site',
+    config => {
+      html_reset(),
+      installsiteman1dir  => catdir($tmp, 'site', 'man', 'man1'),
+      installsiteman3dir  => catdir($tmp, 'site', 'man', 'man3'),
+    },
+  );
 
-$tar = Archive::Tar->new;
-$tar->read( $tarfile, 1 );
+  $mb->dispatch('ppmdist');
+  is $@, '';
 
-ok $tar->contains_file('blib/html/site/lib/Simple.html');
-ok $tar->contains_file('blib/html/bin/hello.html');
+  $tar = Archive::Tar->new;
+  $tar->read( $tarfile, 1 );
 
-$tar->clear;
+  $files = {map { $_ => 1 } $tar->list_files};
 
-$mb->dispatch('realclean');
-$dist->clean;
+  exists_ok($files, 'blib/html/site/lib/Simple.html');
+  exists_ok($files, 'blib/html/bin/hello.html');
+
+  $tar->clear;
+
+  $mb->dispatch('realclean');
+  $dist->clean;
+}
 
 
 chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
@@ -175,3 +202,14 @@
 
 use File::Path;
 rmtree( $tmp );
+
+
+########################################
+
+sub exists_ok {
+  my $files = shift;
+  my $file  = shift;
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
+  ok exists( $files->{$file} ) && $files->{$file}, $file;
+}
+





2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (82)	Dec (58)
2005	Jan (49)	Feb (57)	Mar (49)	Apr (49)	May (2)	Jun (147)	Jul (60)	Aug (55)	Sep (51)	Oct (68)	Nov (61)	Dec (44)
2006	Jan (27)	Feb (38)	Mar (89)	Apr (31)	May (17)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

module-build-checkins Mailing List for Module::Build (Page 10)

module-build-checkins — Notification of CVS commits