!21 【Mainline】fix py-compile-basedir missing test

From: @yixiangzhike 
Reviewed-by: @overweight 
Signed-off-by: @overweight

automake.spec

@@ -4,7 +4,7 @@
 
 Name:           automake
 Version:        1.16.5
-Release:        3
+Release:        4
 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/
@@ -14,6 +14,8 @@ 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
+
 BuildRequires:  perl autoconf make help2man automake perl-generators texinfo
 #for tests
 BuildRequires: libtool gettext-devel flex bison vala
@@ -69,6 +71,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 1.16.5-4
+- fix py-compile-basedir.sh missing test
+
 * Thu Jul 28 2022 fuanan <fuanan3@h-partners.com> - 1.16.5-3
 - Type:bugfix
 - ID:NA

backport-tests-fix-py-compile-basedir.sh-missing-test.patch

@@ -0,0 +1,32 @@
+From ae8fb00111ba0c4922609cd9beb552fb41b66cc6 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@fb.com>
+Date: Tue, 18 Jan 2022 02:00:22 -0800
+Subject: [PATCH] tests: fix py-compile-basedir.sh: missing "test"
+
+Prompted by a patch from Thomas Deutschmann <whissi@gentoo.org>,
+via https://lists.gnu.org/r/automake-patches/2022-01/msg00001.html:
+commit v1.16.1-26-gb279a0d46 ("tests: in python tests, do not
+require .pyo files (for python3)") was missing a `test` call.
+Reported to Gentoo at https://bugs.gentoo.org/715040.
+* t/py-compile-basedir.sh: Rather than just adding the missing
+"test", rewrite using a case statement, to avoid some duplication.
+---
+ t/py-compile-basedir.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
+index 44b6b07c1..22e605f9d 100644
+--- a/t/py-compile-basedir.sh
++++ b/t/py-compile-basedir.sh
+@@ -43,7 +43,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
+   py_installed "$d2/sub/$f.pyc"
+   files=$(find "$d2" | grep '\.py[co]$')
+   # with new-enough Python3, there are six files.
+-  test $(echo "$files" | wc -l) -eq 4 || $(echo "$files" | wc -l) -eq 6
++  case $(echo "$files" | wc -l) in 4|6) ;; *) false;; esac
+   case $d2 in
+     .|..) rm -f $files;;
+        *) rm -rf "$d2";;
+-- 
+2.27.0
+