From 1ddd0324d8c362b22a8000c5d0c115397a556f59 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 3 Jul 2017 13:46:42 -0600 Subject: [PATCH 1/1] Restore a portion of reverted commits See the previous commit for details. --- t/lib/warnings/utf8 | 7 +++---- t/op/ver.t | 23 +---------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/t/lib/warnings/utf8 b/t/lib/warnings/utf8 index 64f0829..2bd59f6 100644 --- a/t/lib/warnings/utf8 +++ b/t/lib/warnings/utf8 @@ -99,12 +99,11 @@ Operation "uc" returns its argument for non-Unicode code point 0x110000 at - lin Operation "uc" returns its argument for UTF-16 surrogate U+D800 at - line 5. ######## use warnings 'utf8'; -no warnings 'deprecated'; # This is above IV_MAX on 32 bit machines -my $big_nonUnicode = uc(chr(0x8000_0000)); +my $big_nonUnicode = uc(chr(0x7FFF_FFFF)); no warnings 'non_unicode'; -my $big_nonUnicode = uc(chr(0x8000_0000)); +my $big_nonUnicode = uc(chr(0x7FFF_FFFF)); EXPECT -Operation "uc" returns its argument for non-Unicode code point 0x80000000 at - line 3. +Operation "uc" returns its argument for non-Unicode code point 0x7FFFFFFF at - line 2. ######## use warnings 'utf8'; my $d7ff = lc pack("U", 0xD7FF); diff --git a/t/op/ver.t b/t/op/ver.t index e896711..35994df 100644 --- a/t/op/ver.t +++ b/t/op/ver.t @@ -12,7 +12,7 @@ $DOWARN = 1; # enable run-time warnings now use Config; -plan( tests => 58 ); +plan( tests => 52 ); eval 'use v5.5.640'; is( $@, '', "use v5.5.640; $@"); @@ -224,27 +224,6 @@ $v = $revision + $version/1000 + $subversion/1000000; ok( abs($v - $]) < 10**-8 , "\$^V == \$] (numeric)" ); -{ - - no warnings 'deprecated'; # These are above IV_MAX on 32 bit machines - # [ID 20010902.001 (#7608)] check if v-strings handle full UV range or not - if ( $Config{'uvsize'} >= 4 ) { - is( sprintf("%vd", eval 'v2147483647.2147483648'), '2147483647.2147483648', 'v-string > IV_MAX[32-bit]' ); - is( sprintf("%vd", eval 'v3141592653'), '3141592653', 'IV_MAX < v-string < UV_MAX[32-bit]'); - is( sprintf("%vd", eval 'v4294967295'), '4294967295', 'v-string == UV_MAX[32-bit] - 1'); - } - - SKIP: { - skip("No quads", 3) if $Config{uvsize} < 8; - - if ( $Config{'uvsize'} >= 8 ) { - is( sprintf("%vd", eval 'v9223372036854775807.9223372036854775808'), '9223372036854775807.9223372036854775808', 'v-string > IV_MAX[64-bit]' ); - is( sprintf("%vd", eval 'v17446744073709551615'), '17446744073709551615', 'IV_MAX < v-string < UV_MAX[64-bit]'); - is( sprintf("%vd", eval 'v18446744073709551615'), '18446744073709551615', 'v-string == UV_MAX[64-bit] - 1'); - } - } -} - # Tests for magic v-strings $v = 1.2.3; -- 1.8.3.1