diff --git a/0001-Add-retries-to-tests-that-write-to-stderr-on-Windows.patch b/0001-Add-retries-to-tests-that-write-to-stderr-on-Windows.patch new file mode 100644 index 0000000..955be01 --- /dev/null +++ b/0001-Add-retries-to-tests-that-write-to-stderr-on-Windows.patch @@ -0,0 +1,35 @@ +From f8778d13735349d4e7e359a38e7b677693182156 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= +Date: Tue, 24 Aug 2021 13:04:46 +0200 +Subject: [PATCH] Add retries to tests that write to stderr on Windows + +--- + lib/elixir/test/elixir/exception_test.exs | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/lib/elixir/test/elixir/exception_test.exs b/lib/elixir/test/elixir/exception_test.exs +index 6242194f7..fa8a5d3e4 100644 +--- a/lib/elixir/test/elixir/exception_test.exs ++++ b/lib/elixir/test/elixir/exception_test.exs +@@ -470,12 +470,13 @@ test "annotates undefined function error with suggestions" do + * min/1 + """ + +- assert blame_message(:erlang, & &1.gt_cookie()) == """ +- function :erlang.gt_cookie/0 is undefined or private. Did you mean one of: ++ message = blame_message(:erlang, & &1.gt_cookie()) + +- * get_cookie/0 +- * set_cookie/2 +- """ ++ assert message =~ ++ "function :erlang.gt_cookie/0 is undefined or private. Did you mean one of:" ++ ++ assert message =~ "* get_cookie/0" ++ assert message =~ "* set_cookie/2" + end + + test "annotates undefined function clause error with macro hints" do +-- +2.31.1 + diff --git a/elixir.changes b/elixir.changes index 9475711..289d9e7 100644 --- a/elixir.changes +++ b/elixir.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 5 11:51:18 UTC 2021 - Matwey Kornilov + +- Add 0001-Add-retries-to-tests-that-write-to-stderr-on-Windows.patch: + fix build for Factory + ------------------------------------------------------------------- Tue Sep 28 18:07:15 UTC 2021 - Sven Marquardt diff --git a/elixir.spec b/elixir.spec index 7995596..bd5eec5 100644 --- a/elixir.spec +++ b/elixir.spec @@ -25,6 +25,7 @@ Group: Development/Languages/Other URL: http://elixir-lang.org Source0: https://github.com/elixir-lang/elixir/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: macros.elixir +Patch0: 0001-Add-retries-to-tests-that-write-to-stderr-on-Windows.patch BuildRequires: gcc BuildRequires: make # required by Mix.SCM.Git see also (https://github.com/elixir-lang/elixir/issues/1386) @@ -66,6 +67,7 @@ Elixir source code. %prep %setup -q +%patch0 -p1 %build # Elixir wants UTF-8 locale, force it