From ee5d6dc3cce21c8ec10075bee5ca889955da1dba7bdcbffea27a8ad73f7e65f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Wed, 26 Sep 2018 11:07:51 +0000 Subject: [PATCH] Refresh perl_skip_flaky_tests_powerpc.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=171 --- perl.spec | 2 +- perl_skip_flaky_tests_powerpc.patch | 103 ++++++++++------------------ 2 files changed, 38 insertions(+), 67 deletions(-) diff --git a/perl.spec b/perl.spec index fde888f..da6d875 100644 --- a/perl.spec +++ b/perl.spec @@ -171,7 +171,7 @@ cp -p %{SOURCE3} . %patch7 %ifarch ppc ppc64 ppc64le %patch8 -p1 -%patch13 -p1 +%patch13 %endif %patch9 %patch11 diff --git a/perl_skip_flaky_tests_powerpc.patch b/perl_skip_flaky_tests_powerpc.patch index 179f53c..4d7cc35 100644 --- a/perl_skip_flaky_tests_powerpc.patch +++ b/perl_skip_flaky_tests_powerpc.patch @@ -6,22 +6,9 @@ skip flaky tests powerpc as bypass https://bugzilla.suse.com/show_bug.cgi?id=1063176 Signed-off-by: Michel Normand ---- - cpan/Memoize/t/expmod_t.t | 1 + - dist/Time-HiRes/t/alarm.t | 2 +- - dist/Time-HiRes/t/clock.t | 2 +- - dist/Time-HiRes/t/nanosleep.t | 2 +- - dist/Time-HiRes/t/usleep.t | 2 +- - t/op/alarm.t | 1 + - t/op/sigsystem.t | 1 + - t/op/sselect.t | 2 ++ - t/op/stat.t | 1 + - 9 files changed, 10 insertions(+), 4 deletions(-) -Index: perl-5.26.1/cpan/Memoize/t/expmod_t.t -=================================================================== ---- perl-5.26.1.orig/cpan/Memoize/t/expmod_t.t -+++ perl-5.26.1/cpan/Memoize/t/expmod_t.t +--- ./cpan/Memoize/t/expmod_t.t.orig 2018-03-20 20:06:35.000000000 +0000 ++++ ./cpan/Memoize/t/expmod_t.t 2018-09-26 11:05:08.908018123 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/perl @@ -29,10 +16,8 @@ Index: perl-5.26.1/cpan/Memoize/t/expmod_t.t use lib '..'; use Memoize; BEGIN { -Index: perl-5.26.1/dist/Time-HiRes/t/alarm.t -=================================================================== ---- perl-5.26.1.orig/dist/Time-HiRes/t/alarm.t -+++ perl-5.26.1/dist/Time-HiRes/t/alarm.t +--- ./dist/Time-HiRes/t/alarm.t.orig 2018-09-26 11:04:59.936040917 +0000 ++++ ./dist/Time-HiRes/t/alarm.t 2018-09-26 11:05:08.908018123 +0000 @@ -1,6 +1,6 @@ use strict; @@ -41,23 +26,29 @@ Index: perl-5.26.1/dist/Time-HiRes/t/alarm.t BEGIN { push @INC, '.' } use t::Watchdog; -Index: perl-5.26.1/dist/Time-HiRes/t/nanosleep.t -=================================================================== ---- perl-5.26.1.orig/dist/Time-HiRes/t/nanosleep.t -+++ perl-5.26.1/dist/Time-HiRes/t/nanosleep.t -@@ -8,7 +8,7 @@ BEGIN { - } - } +--- ./dist/Time-HiRes/t/clock.t.orig 2018-09-26 11:04:59.936040917 +0000 ++++ ./dist/Time-HiRes/t/clock.t 2018-09-26 11:05:08.908018123 +0000 +@@ -1,6 +1,6 @@ + use strict; --use Test::More tests => 3; +-use Test::More tests => 5; +use Test::More skip_all => "ppc workers are too busy"; BEGIN { push @INC, '.' } use t::Watchdog; -Index: perl-5.26.1/dist/Time-HiRes/t/usleep.t -=================================================================== ---- perl-5.26.1.orig/dist/Time-HiRes/t/usleep.t -+++ perl-5.26.1/dist/Time-HiRes/t/usleep.t +--- ./dist/Time-HiRes/t/nanosleep.t.orig 2018-09-26 11:05:08.908018123 +0000 ++++ ./dist/Time-HiRes/t/nanosleep.t 2018-09-26 11:06:17.203844610 +0000 +@@ -8,7 +8,7 @@ BEGIN { + } + } + +-use Test::More tests => 4; ++use Test::More skip_all => "ppc workers are too busy"; + BEGIN { push @INC, '.' } + use t::Watchdog; + +--- ./dist/Time-HiRes/t/usleep.t.orig 2018-09-26 11:04:59.936040917 +0000 ++++ ./dist/Time-HiRes/t/usleep.t 2018-09-26 11:05:08.908018123 +0000 @@ -8,7 +8,7 @@ BEGIN { } } @@ -67,10 +58,8 @@ Index: perl-5.26.1/dist/Time-HiRes/t/usleep.t BEGIN { push @INC, '.' } use t::Watchdog; -Index: perl-5.26.1/t/op/alarm.t -=================================================================== ---- perl-5.26.1.orig/t/op/alarm.t -+++ perl-5.26.1/t/op/alarm.t +--- ./t/op/alarm.t.orig 2018-05-21 10:44:04.000000000 +0000 ++++ ./t/op/alarm.t 2018-09-26 11:05:08.908018123 +0000 @@ -11,6 +11,7 @@ use Config; if ( !$Config{d_alarm} ) { skip_all("alarm() not implemented on this platform"); @@ -79,10 +68,8 @@ Index: perl-5.26.1/t/op/alarm.t plan tests => 5; my $Perl = which_perl(); -Index: perl-5.26.1/t/op/sigsystem.t -=================================================================== ---- perl-5.26.1.orig/t/op/sigsystem.t -+++ perl-5.26.1/t/op/sigsystem.t +--- ./t/op/sigsystem.t.orig 2018-03-20 20:06:37.000000000 +0000 ++++ ./t/op/sigsystem.t 2018-09-26 11:05:08.908018123 +0000 @@ -11,6 +11,7 @@ use strict; use constant TRUE => ($^X, '-e', 'exit 0'); use Data::Dumper; @@ -91,23 +78,9 @@ Index: perl-5.26.1/t/op/sigsystem.t plan tests => 4; SKIP: { -Index: perl-5.26.1/t/op/stat.t -=================================================================== ---- perl-5.26.1.orig/t/op/stat.t -+++ perl-5.26.1/t/op/stat.t -@@ -7,6 +7,7 @@ BEGIN { - } - - use Config; -+skip_all("ppc workers are too busy"); - - my ($Null, $Curdir); - if(eval {require File::Spec; 1}) { -Index: perl-5.26.1/t/op/sselect.t -=================================================================== ---- perl-5.26.1.orig/t/op/sselect.t -+++ perl-5.26.1/t/op/sselect.t -@@ -11,6 +11,8 @@ BEGIN { +--- ./t/op/sselect.t.orig 2018-05-21 12:29:23.000000000 +0000 ++++ ./t/op/sselect.t 2018-09-26 11:05:08.908018123 +0000 +@@ -13,6 +13,8 @@ BEGIN { skip_all("Win32 miniperl has no socket select") if $^O eq "MSWin32" && is_miniperl(); @@ -116,15 +89,13 @@ Index: perl-5.26.1/t/op/sselect.t plan (16); my $blank = ""; -Index: perl-5.26.1/dist/Time-HiRes/t/clock.t -=================================================================== ---- perl-5.26.1.orig/dist/Time-HiRes/t/clock.t -+++ perl-5.26.1/dist/Time-HiRes/t/clock.t -@@ -1,6 +1,6 @@ +--- ./t/op/stat.t.orig 2018-05-21 12:29:23.000000000 +0000 ++++ ./t/op/stat.t 2018-09-26 11:05:08.908018123 +0000 +@@ -9,6 +9,7 @@ BEGIN { use strict; + use warnings; + use Config; ++skip_all("ppc workers are too busy"); --use Test::More tests => 5; -+use Test::More skip_all => "ppc workers are too busy"; - BEGIN { push @INC, '.' } - use t::Watchdog; - + my ($Null, $Curdir); + if(eval {require File::Spec; 1}) {