version 0.9924_02

rurban · rurban · commit 9dea10059207 · 2018-10-13T13:50:00.000+02:00
more test fixes for 5.6 upstream switched to github repo (cherry picked from commit c7d0460)
diff --git a/.git-rr-cache b/.git-rr-cache
@@ -1 +1 @@
-Subproject commit 9fb0f51da23cfcbea184e2e3388456743e0254f4
+Subproject commit 901ec9f6b69723c652218464d33744e1e8af8365
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -1561,7 +1561,7 @@ package Maintainers;
 
     'version' => {
         # https://github.com/rurban/version/commits/cperl
-        'DISTRIBUTION' => 'RURBAN/version-0.9923_02.tar.gz',
+        'DISTRIBUTION' => 'RURBAN/version-0.9924_02.tar.gz',
         'FILES'        => q[cpan/version vutil.c vutil.h vxs.inc],
         'EXCLUDED' => [
             qr{^vutil/lib/},
diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm
@@ -3,9 +3,15 @@ package version;
 
 use 5.006002;
 use strict;
+use warnings::register;
+if ($] >= 5.015) {
+    warnings::register_categories(qw/version/);
+}
 
-our $VERSION = '0.9923_02c';
-$VERSION =~ s/c$//;
+our $VERSION = '0.9924_02';
+our $XS_VERSION = $VERSION;
+#$VERSION =~ s/c$//;
+$VERSION = eval $VERSION;
 our $CLASS = 'version';
 our (@ISA, $STRICT, $LAX);
 
diff --git a/cpan/version/lib/version.pod b/cpan/version/lib/version.pod
@@ -12,8 +12,8 @@ version - Perl extension for Version Objects
   # Declaring a dotted-decimal $VERSION (keep on one line!)
 
   use version; our $VERSION = version->declare("v1.2.3"); # formal
-  use version; our $VERSION = qv("v1.2.3");               # shorthand
-  use version; our $VERSION = qv("v1.2_3");               # alpha
+  use version; our $VERSION = qv("v1.2.3");               # deprecated
+  use version; our $VERSION = qv("v1.2_3");               # deprecated
 
   # Declaring an old-style decimal $VERSION (use quotes!)
 
diff --git a/cpan/version/lib/version/regex.pm b/cpan/version/lib/version/regex.pm
@@ -2,8 +2,7 @@ package version::regex;
 
 use strict;
 
-our $VERSION = '0.9923_02c';
-$VERSION =~ s/c$//;
+our $VERSION = '0.9924_02';
 
 #--------------------------------------------------------------------------#
 # Version regexp components
diff --git a/cpan/version/t/01base.t b/cpan/version/t/01base.t
@@ -14,7 +14,7 @@ BEGIN {
         )
     );
     require $coretests;
-    use_ok('version', 0.9923);
+    use_ok('version', 0.992402);
 }
 
 BaseTests("version","new","qv");
diff --git a/cpan/version/t/02derived.t b/cpan/version/t/02derived.t
@@ -15,7 +15,7 @@ BEGIN {
         )
     );
     require $coretests;
-    use_ok("version", 0.9923);
+    use_ok("version", 0.992402);
     # If we made it this far, we are ok.
 }
 
diff --git a/cpan/version/t/03require.t b/cpan/version/t/03require.t
@@ -19,7 +19,7 @@ BEGIN {
 # Don't want to use, because we need to make sure that the import doesn't
 # fire just yet (some code does this to avoid importing qv() and delare()).
 require_ok("version");
-is $version::VERSION, '0.9923_02', "Make sure we have the correct class";
+is $version::VERSION, 0.992402, "Make sure we have the correct class";
 ok(!"main"->can("qv"), "We don't have the imported qv()");
 ok(!"main"->can("declare"), "We don't have the imported declare()");
 
diff --git a/cpan/version/t/05sigdie.t b/cpan/version/t/05sigdie.t
@@ -14,7 +14,7 @@ BEGIN {
 }
 
 BEGIN {
-    use version 0.9923;
+    use version 0.992402;
 }
 
 pass "Didn't get caught by the wrong DIE handler, which is a good thing";
diff --git a/cpan/version/t/06noop.t b/cpan/version/t/06noop.t
@@ -7,7 +7,7 @@
 use Test::More qw/no_plan/;
 
 BEGIN {
-    use_ok('version', 0.9923);
+    use_ok('version', 0.992402);
 }
 
 my $v1 = version->new('1.2');
diff --git a/cpan/version/t/07locale.t b/cpan/version/t/07locale.t
@@ -11,7 +11,7 @@ use Test::More tests => 8;
 use Config;
 
 BEGIN {
-    use_ok('version', 0.9923);
+    use_ok('version', 0.992402);
 }
 
 SKIP: {
diff --git a/cpan/version/t/08_corelist.t b/cpan/version/t/08_corelist.t
@@ -5,7 +5,7 @@
 #########################
 
 use Test::More tests => 3;
-use_ok("version", 0.9923);
+use_ok("version", 0.992402);
 
 # do strict lax tests in a sub to isolate a package to test importing
 SKIP: {
diff --git a/cpan/version/t/09_list_util.t b/cpan/version/t/09_list_util.t
@@ -4,7 +4,7 @@
 #########################
 
 use strict;
-use_ok("version", 0.9923);
+use_ok("version", 0.992402);
 use Test::More;
 
 BEGIN {
diff --git a/cpan/version/t/coretests.pm b/cpan/version/t/coretests.pm
@@ -330,7 +330,7 @@ SKIP:    { # https://rt.perl.org/rt3/Ticket/Display.html?id=95544
 
 SKIP: 	{
 	skip 'Cannot test bare v-strings with Perl < 5.6.0', 4
-		if $] < 5.006_000;
+		if $] < 5.006;
 	$version = $CLASS->$method(1.2.3);
 	ok("$version" eq "v1.2.3", '"$version" eq 1.2.3');
 	$version = $CLASS->$method(1.0.0);
@@ -430,7 +430,7 @@ EOF
 
 SKIP: {
     skip "Cannot test \"use parent $CLASS\"  when require is used", 3
-	unless defined $qv_declare;
+	if !defined $qv_declare or $] < 5.008;
     my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1);
     (my $package = basename($filename)) =~ s/\.pm$//;
     print $fh <<"EOF";
@@ -580,9 +580,10 @@ SKIP: {
     }
 
     { # https://rt.cpan.org/Ticket/Display.html?id=88495
+        package ver;
 	@ver::ISA = $CLASS;
-	is ref(ver->new), 'ver', 'ver can inherit from version';
-	is ref(ver->qv("1.2.3")), 'ver', 'ver can inherit from version';
+	main::is(ref(ver->new), 'ver', 'ver can inherit from version');
+	main::is(ref(ver->qv("1.2.3")), 'ver', 'ver can inherit from version');
     }
 
     { # discovered while integrating with bleadperl
@@ -636,4 +637,3 @@ SKIP: {
 }
 
 1;
-
diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm
@@ -17674,6 +17674,8 @@ our %delta = (
             'Math::BigInt::Lib'     => '1.999814',
             'Math::BigInt::FastCalc'=> '0.5008',
             'Storable'              => '3.12_02',
+            'version'               => '0.9924_02',
+            'version::regex'        => '0.9924_02',
         },
         removed => {
         }
diff --git a/pod/perlcdelta.pod b/pod/perlcdelta.pod
@@ -166,6 +166,10 @@ It wrapped around previously. Fixes Coverity CID #187854.
 Move __Storable__.pm into Storable_pm.PL
 L<[cperl #374]|https://github.com/perl11/cperl/issues/374>
 
+=item L<version> 0.9924_02
+
+more test fixes for 5.6
+
 =back
 
 =head1 Documentation
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
@@ -159,7 +159,7 @@ threads dist/threads/lib/threads.pm 070834529ce90f9cd47f9113e0803f4f44f47629
 threads dist/threads/t/locale.t 9a2a5b43a39867590eb288d4a1759abac2052aa8
 threads dist/threads/threads.xs 9d4c375efbcd56b57416c87406afec861bc01360
 threads::shared dist/threads-shared/t/waithires.t dc867159fd2fa8c09326cd7627f5a0635ca5e3b5
-version cpan/version/lib/version.pm 5c578896318efbc417130d977da356792954da03
-version cpan/version/lib/version/regex.pm ba583136e44d520d5a8636c85d27a007cd8d6f1e
-version vutil.c ea25ed9a0947909ea4d10a9a5f866f62c2299112
+version cpan/version/lib/version.pm 0452729f5f60eede0478950ab2f96723df6211e7
+version cpan/version/lib/version/regex.pm f46db13227bff99d4421b857a9d9fe5066e70db4
+version vutil.c 523c4e7c08174d8ef0fb948380605825c0bbc46c
 version vxs.inc 3ac4b29b5093605e3bbf59c20814ef4a601484e4
diff --git a/vutil.c b/vutil.c
@@ -305,7 +305,7 @@ Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv)
     last = PRESCAN_VERSION(s, FALSE, &errstr, &qv, &saw_decimal, &width, &alpha);
     if (errstr) {
 	/* "undef" is a special case and not an error */
-	if ( !strEQc(s, "undef") ) {
+	if ( strNEc(s, "undef") ) {
 	    Perl_croak(aTHX_ "%s", errstr);
 	}
     }
@@ -691,8 +691,8 @@ Perl_upg_version(pTHX_ SV *ver, bool qv)
                 LC_NUMERIC_LOCK(0);
 
                 locale_name_on_entry = setlocale(LC_NUMERIC, NULL);
-                if (   strNE(locale_name_on_entry, "C")
-                    && strNE(locale_name_on_entry, "POSIX"))
+                if (   strNEc(locale_name_on_entry, "C")
+                    && strNEc(locale_name_on_entry, "POSIX"))
                 {
                     setlocale(LC_NUMERIC, "C");
                 }
diff --git a/vutil.h b/vutil.h
@@ -222,7 +222,6 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 	assert(pat)
 #endif
 
-
 #if !defined(LC_NUMERIC_LOCK) /* PERL_VERSION_LT(5,27,9) */
 #  define LC_NUMERIC_LOCK
 #  define LC_NUMERIC_UNLOCK
@@ -249,7 +248,6 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 #ifndef LOCK_NUMERIC_STANDARD
 #  define LOCK_NUMERIC_STANDARD()
 #endif
-
 #ifndef UNLOCK_NUMERIC_STANDARD
 #  define UNLOCK_NUMERIC_STANDARD()
 #endif
@@ -263,9 +261,6 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 #endif
 
 /* from cperl */
-#ifndef strNEs
-#  define strNEs(s1,s2) (strncmp(s1,"" s2 "", sizeof(s2)-1))
-#endif
 #ifndef strEQc
 #  define strEQc(s, c) memEQ(s, ("" c ""), sizeof(c))
 #  define strNEc(s, c) memNE(s, ("" c ""), sizeof(c))

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ BEGIN {`
`14`	`14`	`)`
`15`	`15`	`);`
`16`	`16`	`require $coretests;`
`17`		`- use_ok('version', 0.9923);`
	`17`	`+ use_ok('version', 0.992402);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`BaseTests("version","new","qv");`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ BEGIN {`
`15`	`15`	`)`
`16`	`16`	`);`
`17`	`17`	`require $coretests;`
`18`		`- use_ok("version", 0.9923);`
	`18`	`+ use_ok("version", 0.992402);`
`19`	`19`	`# If we made it this far, we are ok.`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Test::More qw/no_plan/;`
`8`	`8`
`9`	`9`	`BEGIN {`
`10`		`- use_ok('version', 0.9923);`
	`10`	`+ use_ok('version', 0.992402);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`my $v1 = version->new('1.2');`