[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] tests: fix py-compile-basedir.sh: add missing test call
From: |
Jim Meyering |
Subject: |
Re: [PATCH] tests: fix py-compile-basedir.sh: add missing test call |
Date: |
Tue, 18 Jan 2022 11:29:22 +0100 |
On Tue, Jan 18, 2022 at 10:29 AM Mike Frysinger <vapier@gentoo.org> wrote:
> On 18 Jan 2022 09:48, Jim Meyering wrote:
...
> > But IMHO that's too much duplication/syntax.
> > How about this instead?
> >
> > case $(echo "$files" | wc -l) in 4|6) ;; *) false;; esac
>
> looks reasonable for POSIX shell. not a fan of the one-line, but that style
> seems to be SOP for test code, so i won't whine too loudly :p.
>
> i assume you'll take care of writing the actual patch at this point since it
> was your idea ? :)
Sure. How about this?
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";;
--