2023-10-31 15:31:15

by Arnaldo Carvalho de Melo

Subject: [PATCH next 2/3] perf tests make: Remove the last egrep call, use 'grep -E' instead

One last case, caught while testing with amazonlinux:2, centos:stream,
etc:

4 7.28 amazonlinux:2 : FAIL egrep: warning: egrep is obsolescent; using grep -E
8 13.87 centos:stream : FAIL egrep: warning: egrep is obsolescent; using grep -E

Cc: Adrian Hunter <[email protected]>
Cc: Guilherme Amadio <[email protected]>
Cc: Ian Rogers <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/tests/make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index d9945ed25bc5ae96..8a4da7eb637a8abd 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -183,7 +183,7 @@ run += make_install_prefix_slash
# run += make_install_pdf
run += make_minimal

-old_libbpf := $(shell echo '\#include <bpf/libbpf.h>' | $(CC) -E -dM -x c -| egrep -q "define[[:space:]]+LIBBPF_MAJOR_VERSION[[:space:]]+0{1}")
+old_libbpf := $(shell echo '\#include <bpf/libbpf.h>' | $(CC) -E -dM -x c -| grep -q -E "define[[:space:]]+LIBBPF_MAJOR_VERSION[[:space:]]+0{1}")

ifneq ($(old_libbpf),)
run += make_libbpf_dynamic
--
2.41.0

2023-11-01 15:36:06

by Guilherme Amadio

Subject: Re: [PATCH next 2/3] perf tests make: Remove the last egrep call, use 'grep -E' instead

Hi Arnaldo,

On Tue, Oct 31, 2023 at 12:31:01PM -0300, Arnaldo Carvalho de Melo wrote:
> One last case, caught while testing with amazonlinux:2, centos:stream,
> etc:
>
> 4 7.28 amazonlinux:2 : FAIL egrep: warning: egrep is obsolescent; using grep -E
> 8 13.87 centos:stream : FAIL egrep: warning: egrep is obsolescent; using grep -E
>
> Cc: Adrian Hunter <[email protected]>
> Cc: Guilherme Amadio <[email protected]>

Looks good.

Reviewed-by: Guilherme Amadio <[email protected]>

Cheers,
-Guilherme

> Cc: Ian Rogers <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Cc: Namhyung Kim <[email protected]>
> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
> ---
> tools/perf/tests/make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index d9945ed25bc5ae96..8a4da7eb637a8abd 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -183,7 +183,7 @@ run += make_install_prefix_slash
> # run += make_install_pdf
> run += make_minimal
>
> -old_libbpf := $(shell echo '\#include <bpf/libbpf.h>' | $(CC) -E -dM -x c -| egrep -q "define[[:space:]]+LIBBPF_MAJOR_VERSION[[:space:]]+0{1}")
> +old_libbpf := $(shell echo '\#include <bpf/libbpf.h>' | $(CC) -E -dM -x c -| grep -q -E "define[[:space:]]+LIBBPF_MAJOR_VERSION[[:space:]]+0{1}")
>
> ifneq ($(old_libbpf),)
> run += make_libbpf_dynamic
> --
> 2.41.0
>