r49158 - in /branches/upstream/libtest-distmanifest-perl/current: Build.PL Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL SIGNATURE lib/Test/DistManifest.pm t/03core.t t/03warn-only.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Dec 22 14:41:18 UTC 2009
Author: jawnsy-guest
Date: Tue Dec 22 14:41:12 2009
New Revision: 49158
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49158
Log:
[svn-upgrade] Integrating new upstream version, libtest-distmanifest-perl (1.006)
Removed:
branches/upstream/libtest-distmanifest-perl/current/Makefile.PL
Modified:
branches/upstream/libtest-distmanifest-perl/current/Build.PL
branches/upstream/libtest-distmanifest-perl/current/Changes
branches/upstream/libtest-distmanifest-perl/current/MANIFEST
branches/upstream/libtest-distmanifest-perl/current/MANIFEST.SKIP
branches/upstream/libtest-distmanifest-perl/current/META.yml
branches/upstream/libtest-distmanifest-perl/current/SIGNATURE
branches/upstream/libtest-distmanifest-perl/current/lib/Test/DistManifest.pm
branches/upstream/libtest-distmanifest-perl/current/t/03core.t
branches/upstream/libtest-distmanifest-perl/current/t/03warn-only.t
Modified: branches/upstream/libtest-distmanifest-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/Build.PL?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/Build.PL (original)
+++ branches/upstream/libtest-distmanifest-perl/current/Build.PL Tue Dec 22 14:41:12 2009
@@ -3,7 +3,7 @@
# Build.PL
# Script to build and install this distribution
#
-# $Id: Build.PL 9529 2009-10-04 04:34:32Z FREQUENCY at cpan.org $
+# $Id: Build.PL 10579 2009-12-22 01:16:57Z FREQUENCY at cpan.org $
use strict;
use warnings;
@@ -20,9 +20,6 @@
recursive_test_files => 1,
sign => 1,
create_packlist => 1,
-
- # Maintain compatibility with ExtUtils::MakeMaker installations
- create_makefile_pl => 'passthrough',
requires => {
'perl' => 5.006,
Modified: branches/upstream/libtest-distmanifest-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/Changes?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/Changes (original)
+++ branches/upstream/libtest-distmanifest-perl/current/Changes Tue Dec 22 14:41:12 2009
@@ -1,3 +1,12 @@
+1.006 - 21 Dec 2009 - Jonathan Yu <jawnsy at cpan.org>
+
+ + Update MANIFEST.SKIP according to new defaults provided by
+ ExtUtils::Manifest
+ + Cleaned up some documentation issues
+ + Use the default MANIFEST.SKIP if ours can't be parsed
+ + Updated tests to match new behaviour
+ + Remove pass-through Build.PL
+
1.005 - 12 Oct 2009 - Jonathan Yu <jawnsy at cpan.org>
+ Fix the dist (don't overwrite the Changes file)
Modified: branches/upstream/libtest-distmanifest-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/MANIFEST?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/MANIFEST (original)
+++ branches/upstream/libtest-distmanifest-perl/current/MANIFEST Tue Dec 22 14:41:12 2009
@@ -5,6 +5,7 @@
LICENSE
MANIFEST This list of files
MANIFEST.SKIP
+META.yml
README
t/00signature.t
t/01compile.t
@@ -19,6 +20,4 @@
t/99min-perl.t
t/circular
t/extra
-Makefile.PL
-META.yml
SIGNATURE Added here by Module::Build
Modified: branches/upstream/libtest-distmanifest-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/MANIFEST.SKIP?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/MANIFEST.SKIP (original)
+++ branches/upstream/libtest-distmanifest-perl/current/MANIFEST.SKIP Tue Dec 22 14:41:12 2009
@@ -1,4 +1,4 @@
-# Version control files and dirs.
+# Avoid version control files.
\bRCS\b
\bCVS\b
\bSCCS\b
@@ -7,17 +7,14 @@
\B\.git\b
\B\.gitignore\b
\b_darcs\b
+\B\.cvsignore$
-# Module::Build generated files and dirs.
-^Build$
-^Build\.bat$
-^_build/
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
-# Module::Install included files.
-^inc/Module/Install
-
-# Makemaker generated files and dirs.
-^MYMETA\.yml$
+# Avoid Makemaker generated and utility files.
\bMANIFEST\.bak
\bMakefile$
\bblib/
@@ -26,16 +23,36 @@
\bpm_to_blib$
\bblibdirs\.ts$ # 6.18 through 6.25 generated this
-# Temp, old and emacs backup files.
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
~$
\.old$
\#$
\b\.#
\.bak$
\.tmp$
+\.#
+\.rej$
-# Devel::Cover files.
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
\bcover_db\b
+\bcovered\b
+
+# Avoid MYMETA files
+^MYMETA\.
# Test::Kwalitee cache files.
^Debian_CPANTS\.txt
Modified: branches/upstream/libtest-distmanifest-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/META.yml?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/META.yml (original)
+++ branches/upstream/libtest-distmanifest-perl/current/META.yml Tue Dec 22 14:41:12 2009
@@ -1,6 +1,6 @@
---
name: Test-DistManifest
-version: 1.005
+version: 1.006
author:
- 'Jonathan Yu <jawnsy at cpan.org>'
abstract: Author test that validates a package MANIFEST
@@ -10,20 +10,22 @@
bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Test-DistManifest
license: http://dev.perl.org/licenses/
repository: http://svn.ali.as/cpan/trunk/Test-DistManifest
+build_requires:
+ Test::Builder::Tester: 0
+ Test::NoWarnings: 0.084
requires:
Module::Manifest: 0.07
Test::Builder: 0.72
Test::More: 0.62
perl: 5.006
-build_requires:
- Test::Builder::Tester: 0
- Test::NoWarnings: 0.084
+configure_requires:
+ Module::Build: 0.35
dynamic_config: 0
provides:
Test::DistManifest:
file: lib/Test/DistManifest.pm
- version: 1.005
-generated_by: Module::Build version 0.280801
+ version: 1.006
+generated_by: Module::Build version 0.35
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libtest-distmanifest-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/SIGNATURE?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/SIGNATURE (original)
+++ branches/upstream/libtest-distmanifest-perl/current/SIGNATURE Tue Dec 22 14:41:12 2009
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.55.
+signed via the Module::Signature module, version 0.61.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -12,24 +12,23 @@
not run its Makefile.PL or Build.PL.
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-SHA1 3660103cff8564692785193e4598ec70409b8350 Build.PL
-SHA1 f5551d2d231e0580f871049aff598eb17ab53d65 Changes
+SHA1 9029a833e63dd3a4ed8e66935f8829c2da25727d Build.PL
+SHA1 86b13b6c426fce1382d0d5366155e2ff92d7ba27 Changes
SHA1 880bcb00f4ed6b1a0145f48a461f1e62a48f15f0 LICENSE
-SHA1 80a214fb1f831a2acea7b54129a563acf6417e2e MANIFEST
-SHA1 c4a234b4e7105a7e0c9940ecabc9097d54b0824b MANIFEST.SKIP
-SHA1 44396d651853d165dc778f45f47be2f545348c7e META.yml
-SHA1 6935d4c89ba1946c26e1bdbddc7c16d3929e5f7a Makefile.PL
+SHA1 afa7577f1fdc3cf2e5e4f6e9ea9b405d4ac06315 MANIFEST
+SHA1 00fed5572918028398abb60a54b2ebfff4e4f9de MANIFEST.SKIP
+SHA1 24de9ef8e8538df78f0bf37ac746576c3fd3b3e1 META.yml
SHA1 5d25ac11e88eed4fcb23b203de96a1c1d48d3d24 README
SHA1 10b9e261ba0670b3ec7754f9505606933e0d597d examples/checkmanifest.t
-SHA1 868a34b9d51e9e740960b4ba0ff7c56caa07fd12 lib/Test/DistManifest.pm
+SHA1 32a34aeeb17a7cbcf790c5470e6e0cba46530d02 lib/Test/DistManifest.pm
SHA1 971a86e480d866d2ec9edaf472416500b2b90a92 t/00signature.t
SHA1 e9d95aed0cdae6762200ca3d87d91cf6bff817b8 t/01compile.t
SHA1 e6c740bb179966ff7dbffac2bb486a4be19e47b4 t/01portability.t
SHA1 244e00a899d7a7789167ab0c3168e627b38aa4cb t/02manifest.t
-SHA1 32a4237bd7762e86757855a829df5aeb827145ed t/03core.t
-SHA1 fb3d044c6d5a425476526acacc9d1c32279fe38e t/03warn-only.t
+SHA1 792e8a5f2bd7bf9039c92be9da2716715718d2e3 t/03core.t
+SHA1 6b1346eb24d9f99a848c447764f1e008c08b7fa4 t/03warn-only.t
SHA1 b55559812229859f7fc74ff10171f19daf310f63 t/97pod.t
SHA1 c4e57e1e14ddd9d52f4cd2b35f5367e44c83283c t/98pod-coverage.t
SHA1 e642edbaba3d75170f9c9885ae4529fb0a7e79dc t/99kwalitee.t
@@ -40,7 +39,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
-iEYEARECAAYFAkrTDDgACgkQYYN9T93mai+1SgCeOY8BcLUUc9qcaPSJNSyRAO1+
-zpcAn0gjoje4aMY57wre/nkRz7PMRegu
-=f11F
+iQIcBAEBCAAGBQJLL/z3AAoJEPPC9oiiHLZITMgP/2sKk48yvPY1phtNd3ZWbWc3
+Kvjj464icYfi2H54LZI5+Dof6VRkMikp6NPxlGlgBvcRt73+oBb+z3J1rJd4q4VA
+i6oUM0supJb3uekUY6QiAlMTmoFnh6tHr87R6ab8clMvIJ/Tw4O+6I74zBLn3I4e
+3IrEDHr0damxIeLyf8kHGmkXFTBkbaKsblKxiHKXOzQ41ShtezWlnc786IjEK8Kn
+c2ZHM0u6eZYwesOLJj6ukvnQw0okN7vpNLup69Kkhg8s0jSbd5m/jdDzlFK4m3xN
+5KLx9BMmH0JIXznsfMLMhsjsF2tIZkk1/jIgQfc9w5eruf0iiD1uwWz11XZ8T841
+TlWgUoeSIeWoG3buW3zScTb+Z6bjEpMGa5WrFwrOoS2QzTGOYaqMsxBccITqtvpI
+Ok5ygOusP/PszwZTmjjyHdhnOGMFL5AiEB5VXXtV/HsdH0G1dPma70f60cRXlJy7
+U6BvCBiWVaac2ol9G9yKIVgilolPyQe1rT9OfVjv5ImcqkraXouSKQGAv4bd4KbY
+xDypfkXh+am3ACnkz2krti7iiVV1j19D6sGu0sGUCdOQyh/3Tr9p9KxkPAgR/XrN
+d3IZ9FOwp0ZcE425l7MyQqThDcj4i4dzu64p4A6kl8xKmZx/y/u3GiBChqWdHfGE
+5Kv51IX4O0NhAG93/xIN
+=8M6K
-----END PGP SIGNATURE-----
Modified: branches/upstream/libtest-distmanifest-perl/current/lib/Test/DistManifest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/lib/Test/DistManifest.pm?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/lib/Test/DistManifest.pm (original)
+++ branches/upstream/libtest-distmanifest-perl/current/lib/Test/DistManifest.pm Tue Dec 22 14:41:12 2009
@@ -1,7 +1,7 @@
# Test::DistManifest
# Tests that your manifest matches the distribution as it exists.
#
-# $Id: DistManifest.pm 9654 2009-10-12 14:36:19Z FREQUENCY at cpan.org $
+# $Id: DistManifest.pm 10576 2009-12-22 00:13:56Z FREQUENCY at cpan.org $
package Test::DistManifest;
@@ -15,11 +15,11 @@
=head1 VERSION
-Version 1.005 ($Id: DistManifest.pm 9654 2009-10-12 14:36:19Z FREQUENCY at cpan.org $)
+Version 1.006 ($Id: DistManifest.pm 10576 2009-12-22 00:13:56Z FREQUENCY at cpan.org $)
=cut
-our $VERSION = '1.005';
+our $VERSION = '1.006';
$VERSION = eval $VERSION;
=head1 EXPORTS
@@ -105,6 +105,12 @@
=back
+If there is no B<MANIFEST.SKIP> included in your distribution, this module
+will replicate the toolchain behaviour of using the default system-wide
+MANIFEST.SKIP file. To view the contents of this file, use the command:
+
+ $ perldoc -m ExtUtils::MANIFEST.SKIP
+
=head1 SYNOPSIS
use Test::More;
@@ -190,7 +196,7 @@
my $manifest = Module::Manifest->new;
unless ($test->has_plan) {
- $test->plan(tests => 5);
+ $test->plan(tests => 4);
}
# Try to parse the MANIFEST and MANIFEST.SKIP files
@@ -206,9 +212,52 @@
$manifest->open(skip => $skipfile);
};
if ($@) {
+ $test->diag('Unable to parse MANIFEST.SKIP file:');
$test->diag($!);
- }
- $test->ok(!$@, 'Parse MANIFEST.SKIP or equivalent');
+ $test->diag('Using default skip data from ExtUtils::Manifest 1.58');
+ $manifest->parse( skip => [
+ # Version control files
+ '\bRCS\b',
+ '\bCVS\b',
+ '\bSCCS\b',
+ ',v$',
+ '\B\.svn\b',
+ '\B\.git\b',
+ '\B\.gitignore\b',
+ '\b_darcs\b',
+ '\B\.cvsignore$',
+ # Build remnants
+ '\bMANIFEST\.bak',
+ '\bMakefile$',
+ '\bblib/',
+ '\bMakeMaker-\d',
+ '\bpm_to_blib\.ts$',
+ '\bpm_to_blib$',
+ '\bblibdirs\.ts$',
+ '\bBuild$',
+ '\b_build/',
+ '\bBuild.bat$',
+ '\bBuild.COM$',
+ '\bBUILD.COM$',
+ '\bbuild.com$',
+ '^MYMETA\.',
+ # Temporary and backup files
+ '~$',
+ '\.old$',
+ '\#$',
+ '\b\.#',
+ '\.bak$',
+ '\.tmp$',
+ '\.#',
+ '\.rej$',
+ # Mac OSX metadata
+ '\B\.DS_Store',
+ '\B\._',
+ # Devel::Cover files
+ '\bcover_db\b',
+ '\bcovered\b',
+ ]);
+ }
my @files;
# Callback function called by File::Find
@@ -304,13 +353,13 @@
=head1 GUTS
-This module internally plans 5 tests:
+This module internally plans 4 tests:
=over
=item 1
-B<MANIFEST> and B<MANIFEST.SKIP> can be parsed by C<Module::Manifest>
+B<MANIFEST> can be parsed by C<Module::Manifest>
=item 2
@@ -367,12 +416,16 @@
=over
-=item * Thanks to Adam Kennedy E<lt>adamk at cpan.orgE<gt>, developer of
-Module::Manifest, which is used in this module.
-
-=item * Thanks to Apocalypse E<lt>apocal at cpan.orgE<gt>, for helping me
-track down an obscure bug caused by circular dependencies: when files are
-expected by MANIFEST but explictly skipped by MANIFEST.SKIP.
+=item *
+
+Thanks to Adam Kennedy for developing L<Module::Manifest>, which provides
+much of the core functionality for these tests.
+
+=item *
+
+Thanks to Apocalypse E<lt>apocal at cpan.orgE<gt>, for helping me track down
+an obscure bug caused by circular dependencies: when files are expected by
+MANIFEST but explictly skipped by MANIFEST.SKIP.
=back
Modified: branches/upstream/libtest-distmanifest-perl/current/t/03core.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/t/03core.t?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/t/03core.t (original)
+++ branches/upstream/libtest-distmanifest-perl/current/t/03core.t Tue Dec 22 14:41:12 2009
@@ -3,12 +3,12 @@
# t/03core.t
# Ensures the MANIFEST test output looks reasonable.
#
-# $Id: 03core.t 8675 2009-08-20 04:22:33Z FREQUENCY at cpan.org $
+# $Id: 03core.t 10580 2009-12-22 01:59:15Z FREQUENCY at cpan.org $
use strict;
use warnings;
-use Test::Builder::Tester tests => 10; # The sum of all subtests
+use Test::Builder::Tester tests => 9; # The sum of all subtests
use Test::DistManifest;
use Test::NoWarnings; # 1 test
use File::Spec ();
@@ -26,58 +26,55 @@
# Run the test when MANIFEST is invalid but the MANIFEST.SKIP file is okay
# 1 test
test_out('not ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('not ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
+test_out('not ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
test_diag('No such file or directory');
test_fail(+1);
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
manifest_ok('INVALID.FILE', 'MANIFEST.SKIP');
test_test(
- name => 'Fails when MANIFEST cannot be parsed',
- skip_err => 1,
-);
-
-# Run the test when MANIFEST is valid but the MANIFEST.SKIP file is missing
-# 1 test
-test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('not ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('not ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
-test_diag('No such file or directory');
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
-test_fail(+1);
-manifest_ok('MANIFEST', 'INVALID.FILE');
-test_test(
- name => 'Fails when MANIFEST.SKIP cannot be parsed',
- skip_err => 1,
+ name => 'Fails when MANIFEST cannot be parsed',
+ skip_err => 1,
);
# Test what happens when MANIFEST contains some extra files
# 1 test
test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('not ok 3 - All files are listed in MANIFEST or skipped');
-test_out('not ok 4 - All files listed in MANIFEST exist on disk');
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('not ok 2 - All files are listed in MANIFEST or skipped');
+test_out('not ok 3 - All files listed in MANIFEST exist on disk');
+test_out('ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
test_fail(+1);
manifest_ok(File::Spec->catfile('t', 'extra'), 'MANIFEST.SKIP');
test_test(
- name => 'Fails when MANIFEST contains extra files',
- skip_err => 1,
+ name => 'Fails when MANIFEST contains extra files',
+ skip_err => 1,
+);
+
+# Test default MANIFEST.SKIP when none is present
+# 1 test
+test_out('ok 1 - Parse MANIFEST or equivalent');
+test_diag('Unable to parse MANIFEST.SKIP file:');
+test_diag('No such file or directory');
+test_diag('Using default skip data from ExtUtils::Manifest 1.58');
+test_out('ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
+test_out('ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
+manifest_ok('MANIFEST', 'INVALID.FILE');
+test_test(
+ name => 'Uses default MANIFEST.SKIP on failure to parse',
+ skip_err => 1,
);
# Test what happens when we have some strange circular logic; that is,
# when MANIFEST and MANIFEST.SKIP point to the same file!
# 1 test
test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
-test_out('not ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
+test_out('not ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
test_fail(+1);
manifest_ok('MANIFEST', File::Spec->catfile('t', 'circular'));
test_test(
- name => 'Fails when files are in both MANIFEST and MANIFEST.SKIP',
- skip_err => 1,
+ name => 'Fails when files are in both MANIFEST and MANIFEST.SKIP',
+ skip_err => 1,
);
Modified: branches/upstream/libtest-distmanifest-perl/current/t/03warn-only.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-distmanifest-perl/current/t/03warn-only.t?rev=49158&op=diff
==============================================================================
--- branches/upstream/libtest-distmanifest-perl/current/t/03warn-only.t (original)
+++ branches/upstream/libtest-distmanifest-perl/current/t/03warn-only.t Tue Dec 22 14:41:12 2009
@@ -3,12 +3,12 @@
# t/03warn-only.t
# Ensures the nonfatal mode works properly
#
-# $Id: 03warn-only.t 8675 2009-08-20 04:22:33Z FREQUENCY at cpan.org $
+# $Id: 03warn-only.t 10578 2009-12-22 01:12:10Z FREQUENCY at cpan.org $
use strict;
use warnings;
-use Test::Builder::Tester tests => 5; # The sum of all subtests
+use Test::Builder::Tester tests => 4; # The sum of all subtests
use Test::DistManifest;
use Test::NoWarnings; # 1 test
@@ -20,55 +20,37 @@
# Run the test when MANIFEST is invalid but the MANIFEST.SKIP file is okay
# 1 test
test_out('not ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
+test_out('ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
test_diag('No such file or directory');
test_fail(+1);
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
manifest_ok('INVALID.FILE', 'MANIFEST.SKIP');
test_test(
name => 'Fails when MANIFEST cannot be parsed',
skip_err => 1,
);
-# Run the test when MANIFEST is valid but the MANIFEST.SKIP file is missing
-# 1 test
-test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('not ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
-test_diag('No such file or directory');
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
-test_fail(+1);
-manifest_ok('MANIFEST', 'INVALID.FILE');
-test_test(
- name => 'Fails when MANIFEST.SKIP cannot be parsed',
- skip_err => 1,
-);
-
# Test what happens when MANIFEST contains some extra files
# 1 test
test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
-test_out('ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
+test_out('ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
test_fail(+1);
manifest_ok(File::Spec->catfile('t', 'extra'), 'MANIFEST.SKIP');
test_test(
- name => 'Succeeds even when MANIFEST contains extra files',
- skip_err => 1,
+ name => 'Succeeds even when MANIFEST contains extra files',
+ skip_err => 1,
);
# Test what happens when we have some strange circular logic; that is,
# when MANIFEST and MANIFEST.SKIP point to the same file!
# 1 test
test_out('ok 1 - Parse MANIFEST or equivalent');
-test_out('ok 2 - Parse MANIFEST.SKIP or equivalent');
-test_out('ok 3 - All files are listed in MANIFEST or skipped');
-test_out('ok 4 - All files listed in MANIFEST exist on disk');
-test_out('not ok 5 - No files are in both MANIFEST and MANIFEST.SKIP');
+test_out('ok 2 - All files are listed in MANIFEST or skipped');
+test_out('ok 3 - All files listed in MANIFEST exist on disk');
+test_out('not ok 4 - No files are in both MANIFEST and MANIFEST.SKIP');
test_fail(+1);
manifest_ok('MANIFEST', File::Spec->catfile('t', 'circular'));
test_test(
More information about the Pkg-perl-cvs-commits
mailing list