diff --git a/erlang-rebar.spec b/erlang-rebar.spec index 77db6b7..82ef2db 100644 --- a/erlang-rebar.spec +++ b/erlang-rebar.spec @@ -4,7 +4,7 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Name: erlang-%{realname} Version: 2.6.4 -Release: 4 +Release: 5 BuildArch: noarch Summary: Erlang Build Tools License: MIT @@ -25,6 +25,8 @@ Patch12: rebar-0012-Drop-obsolete-crypto-rand_uniform-2.patch Patch13: rebar-0013-Remove-compat-random-modules.patch Patch14: 0014-remove-lerl_interface-build-flag.patch Patch15: 0001-Resolve-erlang-hamcrest-compilation-errors.patch +Patch16: rebar-0014-Disable-two-test-suites-in-Erlang-24.patch + %if 0%{?need_bootstrap} < 1 BuildRequires: erlang-rebar erlang-getopt erlang-eunit erlang-diameter %else @@ -68,6 +70,7 @@ EOT %patch13 -p1 -b .erl22_compat %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build %if 0%{?need_bootstrap} < 1 @@ -96,6 +99,9 @@ sed -i -e "s,-noshell -noinput,-noshell -noinput -pa .,g" ./rebar %{erlang_appdir}/ %changelog +* Mon Sep 18 2023 wangkai <13474090681@163.com> - 2.6.4-5 +- Disable two tests for erlang25 + * Sun Jul 23 2023 wulei - 2.6.4-4 - Fix build error diff --git a/rebar-0014-Disable-two-test-suites-in-Erlang-24.patch b/rebar-0014-Disable-two-test-suites-in-Erlang-24.patch new file mode 100644 index 0000000..5c6c708 --- /dev/null +++ b/rebar-0014-Disable-two-test-suites-in-Erlang-24.patch @@ -0,0 +1,32 @@ +From: Peter Lemenkov +Date: Tue, 10 Aug 2021 16:09:26 +0200 +Subject: [PATCH] Disable two test suites in Erlang 24 + +Signed-off-by: Peter Lemenkov + +diff --git a/test/rebar_eunit_tests.erl b/test/rebar_eunit_tests.erl +index d481dae..872c570 100644 +--- a/test/rebar_eunit_tests.erl ++++ b/test/rebar_eunit_tests.erl +@@ -297,7 +297,7 @@ expected_cover_generated_files() -> + ".eunit/myapp_mymod.COVER.html", + ".eunit/myapp_sup.COVER.html"]. + +-cover_coverage_test_() -> ++cover_coverage_test_ERLANG_24_DISABLE() -> + {"Coverage is accurately calculated", + setup, fun() -> setup_cover_project(), rebar("-v eunit") end, + fun teardown/1, +diff --git a/test/rebar_xref_eunit.erl b/test/rebar_xref_eunit.erl +index f32ea46..5f1282e 100644 +--- a/test/rebar_xref_eunit.erl ++++ b/test/rebar_xref_eunit.erl +@@ -10,7 +10,7 @@ + + -define(TMP_DIR, "tmp_xref_eunit/"). + +-xref_test_() -> ++xref_test_ERLANG_24_DISABLE() -> + {"Test the various xref warnings", + setup, fun() -> setup_project(false), rebar("compile"), rebar("skip_deps=true xref") end, + fun teardown/1,