diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-25 16:34:34 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-25 16:34:34 +0000 |
| commit | 06a3549b494bdf02adfd5471d84cb1cc6eda5f4c (patch) | |
| tree | 5444a9b833c834f2849ff6d78d01d1cb8bb63009 /gnu/usr.bin/perl | |
| parent | 1aa21e1a8f73c88464f3cc3915ed2e6833906b15 (diff) | |
Fix test failures caused by RCS keyword expansion.
Add PERL_GIT_UNCOMMITTED_CHANGES back to git_version.h to fix a test.
Diffstat (limited to 'gnu/usr.bin/perl')
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t | 6 | ||||
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t | 4 | ||||
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/git_version.h | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t index 858e2941813..da5d9511c1f 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t @@ -12,7 +12,7 @@ my $Has_Version = eval 'require version; "version"->import; 1'; my %versions = (q[$VERSION = '1.00'] => '1.00', q[*VERSION = \'1.01'] => '1.01', - q[($VERSION) = q$Revision: 32208 $ =~ /(\d+)/g;] => 32208, + q[($VERSION) = q/Revision: 32208 / =~ /(\d+)/g;] => 32208, q[$FOO::VERSION = '1.10';] => '1.10', q[*FOO::VERSION = \'1.11';] => '1.11', '$VERSION = 0.02' => 0.02, @@ -34,8 +34,8 @@ my %versions = (q[$VERSION = '1.00'] => '1.00', qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n] => '2.3', qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n\$VERSION = 4.5\n] => '2.3', - '$VERSION = sprintf("%d.%03d", q$Revision: 3.74 $ =~ /(\d+)\.(\d+)/);' => '3.074', - '$VERSION = substr(q$Revision: 2.8 $, 10) + 2 . "";' => '4.8', + '$VERSION = sprintf("%d.%03d", q/Revision: 3.74 / =~ /(\d+)\.(\d+)/);' => '3.074', + '$VERSION = substr(q/Revision: 2.8 /, 10) + 2 . "";' => '4.8', ); diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t b/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t index 1ac35b28c47..81966c4f651 100755 --- a/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t +++ b/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t @@ -171,9 +171,9 @@ is_deeply($mb->find_dist_packages, { $dist->change_file( 'lib/Simple.pm', <<'---' ); package Simple; -$VERSION = version->new('0.60.' . (qw$Revision: 128 $)[1]); +$VERSION = version->new('0.60.' . (qw/Revision: 128 /)[1]); package Simple::Simon; -$VERSION = version->new('0.61.' . (qw$Revision: 129 $)[1]); +$VERSION = version->new('0.61.' . (qw/Revision: 129 /)[1]); --- $dist->regen; my $provides = new_build()->get_metadata()->{provides}; diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t b/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t index e28726d493a..9c10448624c 100755 --- a/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t +++ b/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t @@ -424,9 +424,9 @@ __DATA__ # Make sure we handle version.pm $VERSIONs well $dist->change_file( 'lib/Simple.pm', <<'---' ); package Simple; -$VERSION = version->new('0.60.' . (qw$Revision: 128 $)[1]); +$VERSION = version->new('0.60.' . (qw/Revision: 128 /)[1]); package Simple::Simon; -$VERSION = version->new('0.61.' . (qw$Revision: 129 $)[1]); +$VERSION = version->new('0.61.' . (qw/Revision: 129 /)[1]); --- $dist->regen; diff --git a/gnu/usr.bin/perl/git_version.h b/gnu/usr.bin/perl/git_version.h index 6f62ef9a835..73e89dbecf4 100644 --- a/gnu/usr.bin/perl/git_version.h +++ b/gnu/usr.bin/perl/git_version.h @@ -2,6 +2,7 @@ * WARNING: 'git_version.h' is automatically generated by make_patchnum.pl * DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead ***************************************************************************/ +#define PERL_GIT_UNCOMMITTED_CHANGES #define PERL_PATCHNUM "" #define PERL_GIT_UNPUSHED_COMMITS \ /*leave-this-comment*/ |