Re: [Cocci] [PATCH] scripts: coccicheck: fix troubles on non-English builds

2021-05-18 Thread Julia Lawall


On Tue, 18 May 2021, Mauro Carvalho Chehab wrote:

> When LANG is not set to English, the logic which checks the
> number of CPUs fail, as the messages can be localized, and
> the logic at:
>
> THREADS_PER_CORE=$(lscpu | grep "Thread(s) per core: " | tr -cd 
> "[:digit:]")
>
> will not get the number of threads per core.
>
> This causes the script to not run properly, as it will produce
> a warning:
>
>   $ make coccicheck 
> COCCI=$PWD/scripts/coccinelle/misc/add_namespace.cocci MODE=report 
> drivers/media/
>   ./scripts/coccicheck: linha 93: [: número excessivo de argumentos
>
> Fix it by forcing LANG=C when calling lscpu.
>
> Signed-off-by: Mauro Carvalho Chehab 

Applied, thanks.

julia

> ---
>  scripts/coccicheck | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index 65fee63aeadb..caba0bff6da7 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -87,7 +87,7 @@ else
>  fi
>
>  # Use only one thread per core by default if hyperthreading is enabled
> -THREADS_PER_CORE=$(lscpu | grep "Thread(s) per core: " | tr -cd 
> "[:digit:]")
> +THREADS_PER_CORE=$(LANG=C lscpu | grep "Thread(s) per core: " | tr -cd 
> "[:digit:]")
>  if [ -z "$J" ]; then
>  NPROC=$(getconf _NPROCESSORS_ONLN)
>   if [ $THREADS_PER_CORE -gt 1 -a $NPROC -gt 4 ] ; then
> --
> 2.31.1
>
>___
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci


[Cocci] [PATCH] scripts: coccicheck: fix troubles on non-English builds

2021-05-18 Thread Mauro Carvalho Chehab
When LANG is not set to English, the logic which checks the
number of CPUs fail, as the messages can be localized, and
the logic at:

THREADS_PER_CORE=$(lscpu | grep "Thread(s) per core: " | tr -cd "[:digit:]")

will not get the number of threads per core.

This causes the script to not run properly, as it will produce
a warning:

$ make coccicheck 
COCCI=$PWD/scripts/coccinelle/misc/add_namespace.cocci MODE=report 
drivers/media/
./scripts/coccicheck: linha 93: [: número excessivo de argumentos

Fix it by forcing LANG=C when calling lscpu.

Signed-off-by: Mauro Carvalho Chehab 
---
 scripts/coccicheck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/coccicheck b/scripts/coccicheck
index 65fee63aeadb..caba0bff6da7 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -87,7 +87,7 @@ else
 fi
 
 # Use only one thread per core by default if hyperthreading is enabled
-THREADS_PER_CORE=$(lscpu | grep "Thread(s) per core: " | tr -cd 
"[:digit:]")
+THREADS_PER_CORE=$(LANG=C lscpu | grep "Thread(s) per core: " | tr -cd 
"[:digit:]")
 if [ -z "$J" ]; then
 NPROC=$(getconf _NPROCESSORS_ONLN)
if [ $THREADS_PER_CORE -gt 1 -a $NPROC -gt 4 ] ; then
-- 
2.31.1

___
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci