[v2] tools/memory-model: Use "grep -E" instead of "egrep"
Commit Message
The latest version of grep claims the egrep is now obsolete so the build
now contains warnings that look like:
egrep: warning: egrep is obsolescent; using grep -E
fix this up by moving the related file to use "grep -E" instead.
sed -i "s/egrep/grep -E/g" `grep egrep -rwl tools/memory-model`
Here are the steps to install the latest grep:
wget http://ftp.gnu.org/gnu/grep/grep-3.8.tar.gz
tar xf grep-3.8.tar.gz
cd grep-3.8 && ./configure && make
sudo make install
export PATH=/usr/local/bin:$PATH
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Reviewed-by: Akira Yokosawa <akiyks@gmail.com>
---
v2: rebase on linux-rcu.git dev
tools/memory-model/scripts/checkghlitmus.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
On Mon, Nov 21, 2022 at 11:25:38AM +0800, Tiezhu Yang wrote:
> The latest version of grep claims the egrep is now obsolete so the build
> now contains warnings that look like:
> egrep: warning: egrep is obsolescent; using grep -E
> fix this up by moving the related file to use "grep -E" instead.
>
> sed -i "s/egrep/grep -E/g" `grep egrep -rwl tools/memory-model`
>
> Here are the steps to install the latest grep:
>
> wget http://ftp.gnu.org/gnu/grep/grep-3.8.tar.gz
> tar xf grep-3.8.tar.gz
> cd grep-3.8 && ./configure && make
> sudo make install
> export PATH=/usr/local/bin:$PATH
>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
> Reviewed-by: Akira Yokosawa <akiyks@gmail.com>
Queued and pushed, thank you both!
Thanx, Paul
> ---
>
> v2: rebase on linux-rcu.git dev
>
> tools/memory-model/scripts/checkghlitmus.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/memory-model/scripts/checkghlitmus.sh b/tools/memory-model/scripts/checkghlitmus.sh
> index cedd029..d3dfb32 100755
> --- a/tools/memory-model/scripts/checkghlitmus.sh
> +++ b/tools/memory-model/scripts/checkghlitmus.sh
> @@ -36,13 +36,13 @@ fi
> # Create a list of the specified litmus tests previously run.
> ( cd $LKMM_DESTDIR; find litmus -name "*.litmus${hwfnseg}.out" -print ) |
> sed -e "s/${hwfnseg}"'\.out$//' |
> - xargs -r egrep -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' |
> + xargs -r grep -E -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' |
> xargs -r grep -L "^P${LKMM_PROCS}"> $T/list-C-already
>
> # Create a list of C-language litmus tests with "Result:" commands and
> # no more than the specified number of processes.
> find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C
> -xargs < $T/list-C -r egrep -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' > $T/list-C-result
> +xargs < $T/list-C -r grep -E -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' > $T/list-C-result
> xargs < $T/list-C-result -r grep -L "^P${LKMM_PROCS}" > $T/list-C-result-short
>
> # Form list of tests without corresponding .out files
> --
> 2.1.0
>
@@ -36,13 +36,13 @@ fi
# Create a list of the specified litmus tests previously run.
( cd $LKMM_DESTDIR; find litmus -name "*.litmus${hwfnseg}.out" -print ) |
sed -e "s/${hwfnseg}"'\.out$//' |
- xargs -r egrep -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' |
+ xargs -r grep -E -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' |
xargs -r grep -L "^P${LKMM_PROCS}"> $T/list-C-already
# Create a list of C-language litmus tests with "Result:" commands and
# no more than the specified number of processes.
find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C
-xargs < $T/list-C -r egrep -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' > $T/list-C-result
+xargs < $T/list-C -r grep -E -l '^ \* Result: (Never|Sometimes|Always|DEADLOCK)' > $T/list-C-result
xargs < $T/list-C-result -r grep -L "^P${LKMM_PROCS}" > $T/list-C-result-short
# Form list of tests without corresponding .out files