diff --git a/perl-5.26.0-t-op-hash.t-fixup-intermittently-failing-test.patch b/perl-5.26.0-t-op-hash.t-fixup-intermittently-failing-test.patch new file mode 100644 index 0000000..9463079 --- /dev/null +++ b/perl-5.26.0-t-op-hash.t-fixup-intermittently-failing-test.patch @@ -0,0 +1,37 @@ +From 37268580c0cfbf190ff9aa7859a604713cb366ee Mon Sep 17 00:00:00 2001 +From: Yves Orton +Date: Tue, 27 Jun 2017 16:36:57 +0200 +Subject: [PATCH] t/op/hash.t: fixup intermittently failing test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Port to 5.26.0: + +commit b2ac59d1d0fda74d6612701d8316fe8dfb6a1b90 +Author: Yves Orton +Date: Tue Jun 27 16:36:57 2017 +0200 + + t/op/hash.t: fixup intermittently failing test + +Signed-off-by: Petr Písař +--- + t/op/hash.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/op/hash.t b/t/op/hash.t +index a0e79c7..b941c57 100644 +--- a/t/op/hash.t ++++ b/t/op/hash.t +@@ -206,7 +206,7 @@ sub torture_hash { + my $keys = pop @groups; + ++$h->{$_} foreach @$keys; + my (undef, $total) = validate_hash("$desc " . keys %$h, $h); +- is($total, $total0, "bucket count is constant when rebuilding"); ++ ok($total == $total0 || $total == ($total0*2), "bucket count is expected size when rebuilding"); + is(scalar %$h, pop @groups, "scalar keys is identical when rebuilding"); + ++$h1->{$_} foreach @$keys; + validate_hash("$desc copy " . keys %$h1, $h1); +-- +2.9.4 + diff --git a/perl.spec b/perl.spec index 17c3a8e..e2bb087 100644 --- a/perl.spec +++ b/perl.spec @@ -185,6 +185,9 @@ Patch44: perl-5.27.2-perl-131646-make-the-test-less-fragile.patch # Fix File::Glob rt131211.t test random failures, in upstream after 5.27.1 Patch45: perl-5.27.1-File-Glob-tweak-rt131211.t-to-be-less-sensitive-on-w.patch +# Fix t/op/hash.t test random failures, in upstream after 5.27.1 +Patch46: perl-5.26.0-t-op-hash.t-fixup-intermittently-failing-test.patch + # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch @@ -2758,6 +2761,7 @@ Perl extension for Version Objects %patch43 -p1 %patch44 -p1 %patch45 -p1 +%patch46 -p1 %patch200 -p1 %patch201 -p1 @@ -2789,6 +2793,7 @@ perl -x patchlevel.h \ 'Fedora Patch40: Fix spurious "Assuming NOT a POSIX class" warning (RT#131522)' \ 'Fedora Patch42: Fix reporting malformed UTF-8 character (RT#131646)' \ 'Fedora Patch45: Fix File::Glob rt131211.t test random failures' \ + 'Fedora Patch46: Fix t/op/hash.t test random failures' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ %{nil} @@ -5075,6 +5080,7 @@ popd * Tue Aug 08 2017 Petr Pisar - 4:5.26.0-398 - Fix reporting malformed UTF-8 character (RT#131646) - Fix File::Glob rt131211.t test random failures +- Fix t/op/hash.t test random failures * Sat Jul 29 2017 Igor Gnatenko - 4:5.26.0-397 - Enable separate debuginfo back