From 049dd5583ac59f5996868388f441432a21a2884b Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Mon, 28 Aug 2023 10:39:58 +0800 Subject: [PATCH] tests: fix objc-megademo.sh: C++ preprocessor /lib/cpp fails sanity check --- automake.spec | 6 +++++- tests-fix-objc-megademo.sh.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests-fix-objc-megademo.sh.patch diff --git a/automake.spec b/automake.spec index c43ca73..a214233 100644 --- a/automake.spec +++ b/automake.spec @@ -4,7 +4,7 @@ Name: automake Version: 1.16.5 -Release: 4 +Release: 5 Summary: A tool for automatically generating Makefile.in files License: GPLv2+ and GFDL-1.3-only and Public Domain and MIT URL: http://www.gnu.org/software/automake/ @@ -15,6 +15,7 @@ Source2: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess BuildArch: noarch Patch1: backport-tests-fix-py-compile-basedir.sh-missing-test.patch +Patch2: tests-fix-objc-megademo.sh.patch BuildRequires: perl autoconf make help2man automake perl-generators texinfo #for tests @@ -71,6 +72,9 @@ fi %{_mandir}/man1/* %changelog +* Mon Aug 28 2023 fuanan - 1.16.5-5 +- tests: fix objc-megademo.sh: C++ preprocessor "/lib/cpp" fails sanity check + * Sat Oct 22 2022 yixiangzhike - 1.16.5-4 - fix py-compile-basedir.sh missing test diff --git a/tests-fix-objc-megademo.sh.patch b/tests-fix-objc-megademo.sh.patch new file mode 100644 index 0000000..989ab44 --- /dev/null +++ b/tests-fix-objc-megademo.sh.patch @@ -0,0 +1,26 @@ +From 3c48685e370f5aee7d709298b06c73227f78cbc2 Mon Sep 17 00:00:00 2001 +From: fly_fzc <2385803914@qq.com> +Date: Mon, 28 Aug 2023 10:01:41 +0800 +Subject: [PATCH] tests: fix objc-megademo.sh: C++ preprocessor "/lib/cpp" fails sanity check + +In the test case objc-megademo.sh, if an exception occurs during the configuration phase, the recommended exit code is 77. +--- + t/objc-megademo.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh +index 11544ea..d0cb03b 100644 +--- a/t/objc-megademo.sh ++++ b/t/objc-megademo.sh +@@ -319,6 +319,8 @@ END + + ## Configure and build. + ++sed -i 's|as_fn_error.*fails sanity check|as_fn_error 77 "C++ preprocessor \"$CXXCPP\" fails sanity check|g' configure ++ + ./configure + $MAKE + +-- +2.27.0 + -- Gitee