Re: [libgpiod][PATCH] tools: tests: replace egrep with grep -E

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jun 01, 2023 at 04:09:50PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> 
> Since version 3.11 egrep emits the following warning to stderr on startup:
> 
>   egrep: warning: egrep is obsolescent; using grep -E
> 
> This makes the tests fail (though that seems to depend on BATS version)
> so replace egrep with grep -E as suggested.
> 

That works for me, so I don't have any objections.

Though FWIW, my global sim cleanup script looks like:

find /sys/kernel/config/gpio-sim -type d -name hog -print0 2>/dev/null | xargs -0 -r rmdir
find /sys/kernel/config/gpio-sim -type d -name "line*" -print0  2>/dev/null | xargs -0 -r rmdir
find /sys/kernel/config/gpio-sim -type d -name "bank*" -print0 2>/dev/null | xargs -0 -r rmdir
rmdir /sys/kernel/config/gpio-sim/*

So no grep at all, just find and xargs.
That is for all sims, but could easily be reduced to a particular sim,
given the sim name.

Setting live to 0 seems to be optional - deleting everything works fine
for me.

Cheers,
Kent.

> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> ---
>  tools/gpio-tools-test      | 2 +-
>  tools/gpio-tools-test.bats | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/gpio-tools-test b/tools/gpio-tools-test
> index 5b6c72e..ed39ed5 100755
> --- a/tools/gpio-tools-test
> +++ b/tools/gpio-tools-test
> @@ -37,7 +37,7 @@ check_prog() {
>  check_prog bats
>  check_prog modprobe
>  check_prog timeout
> -check_prog egrep
> +check_prog grep
>  
>  # Check if we're running a kernel at the required version or later
>  check_kernel $MIN_KERNEL_VERSION
> diff --git a/tools/gpio-tools-test.bats b/tools/gpio-tools-test.bats
> index adbce94..c83ca7d 100755
> --- a/tools/gpio-tools-test.bats
> +++ b/tools/gpio-tools-test.bats
> @@ -154,7 +154,7 @@ gpiosim_cleanup() {
>  		ls $BANKPATH/line* > /dev/null 2>&1
>  		if [ "$?" = "0" ]
>  		then
> -			for LINE in $(find $BANKPATH/ | egrep "line[0-9]+$")
> +			for LINE in $(find $BANKPATH/ | grep -E "line[0-9]+$")
>  			do
>  				test -e $LINE/hog && rmdir $LINE/hog
>  				rmdir $LINE
> -- 
> 2.39.2
> 



[Index of Archives]     [Linux SPI]     [Linux Kernel]     [Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [Linux for Samsung SOC]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [Linux MIPS]     [Yosemite Campsites]

  Powered by Linux