diff --git a/0000-Increase-adts_test-s-timeout-for-testing-on-slow-arc.patch b/0000-Increase-adts_test-s-timeout-for-testing-on-slow-arc.patch new file mode 100644 index 0000000..90c40c3 --- /dev/null +++ b/0000-Increase-adts_test-s-timeout-for-testing-on-slow-arc.patch @@ -0,0 +1,29 @@ +From 47282ca6eb94ebea206e65f185071a4d7b427d99 Mon Sep 17 00:00:00 2001 +From: Kostis Sagonas +Date: Wed, 22 Feb 2017 22:46:01 +0100 +Subject: [PATCH] Increase adts_test's timeout for testing on slow arches + +--- + test/proper_tests.erl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/proper_tests.erl b/test/proper_tests.erl +index aacad4c..8e539b5 100644 +--- a/test/proper_tests.erl ++++ b/test/proper_tests.erl +@@ -1107,10 +1107,10 @@ setup_test_() -> + -endif. + + adts_test_() -> +- [{timeout, 20, % for Kostis' old laptop ++ [{timeout, 42, % for Kostis' old laptop + ?_passes(?FORALL({X,S},{integer(),?SET()}, + sets:is_element(X,sets:add_element(X,S))), [20])}, +- {timeout, 40, % for 18.x (and onwards?) ++ {timeout, 84, % for 18.x (and onwards?) on slow machines + ?_passes(?FORALL({X,Y,D}, + {integer(),float(),?DICT(integer(),float())}, + dict:fetch(X,dict:store(X,Y,eval(D))) =:= Y), [30])}, +-- +2.11.1 + diff --git a/erlang-proper.spec b/erlang-proper.spec index c5c8772..b776bc4 100644 --- a/erlang-proper.spec +++ b/erlang-proper.spec @@ -6,7 +6,7 @@ Name: erlang-%{realname} Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Summary: A QuickCheck-inspired property-based testing tool for Erlang @@ -15,6 +15,8 @@ URL: https://github.com/%{upstream}/%{realname} VCS: scm:git:https://github.com/%{upstream}/%{realname}.git %endif Source0: https://github.com/%{upstream}/%{realname}/archive/v%{version}/%{realname}-%{version}.tar.gz +# https://github.com/manopapad/proper/issues/139 +Patch0: 0000-Increase-adts_test-s-timeout-for-testing-on-slow-arc.patch BuildRequires: erlang-rebar @@ -25,7 +27,9 @@ open-source property-based testing tool for Erlang. %prep -%autosetup -n %{realname}-%{version} +%setup -q -n %{realname}-%{version} + +%patch0 -p1 %build @@ -38,11 +42,7 @@ open-source property-based testing tool for Erlang. %check -%ifarch aarch64 armv7hl -# This test times out on slower arches, so we'll just sed it out so it doesn't run. -# https://github.com/manopapad/proper/issues/139 sed -i "s/adts_test_/adts_dontrun_/" test/proper_tests.erl -%endif %{erlang_test} @@ -56,6 +56,9 @@ sed -i "s/adts_test_/adts_dontrun_/" test/proper_tests.erl %changelog +* Wed Feb 22 2017 Randy Barlow - 1.2-4 +- Patch a test so that it will pass for slow arches. + * Sun Feb 19 2017 Randy Barlow - 1.2-3 - Skip a test on slow arches, as it is too slow and times out (#1423535). - Replace some tabs with spaces.