On Tue, Jan 18, 2022 at 7:46 AM Mike Frysinger <vap...@gentoo.org> wrote:
> From: Thomas Deutschmann <whi...@gentoo.org>
>
> Commit b279a0d46dfeca1ca40057c3c910ab1657d60be5 ("tests: in python
> tests, do not require .pyo files (for python3)") had a slight logic
> error in that it missed a `test` call.
>
> Reported to Gentoo at https://bugs.gentoo.org/715040.
>
> * t/py-compile-basedir.sh: Add test command.
> ---
> 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 44b6b07c1962..979f65710c0b 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
> + test $(echo "$files" | wc -l) -eq 4 || test $(echo "$files" | wc -l) -eq 6
Thanks. Good catch.
If we were to use that, it's a little better to double-quote each
$(...) result, in case somehow the result is not just precisely one
token:
test "$(echo "$files" | wc -l)" -eq 4 || test "$(echo "$files" | wc -l)" -eq 6
But IMHO that's too much duplication/syntax.
How about this instead?
case $(echo "$files" | wc -l) in 4|6) ;; *) false;; esac
