diff options
| author |   Frederic Weisbecker <frederic@kernel.org> | 2020-11-19 01:30:24 +0100 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@kernel.org> | 2021-01-04 14:01:20 -0800 |
| commit | 106cc0d9e79aa7fcb43bd8feab97ee6e114d348b (patch) | |
| tree | b8c7f986818061d3f4615131083b350be26fbf2a /tools/testing/selftests/rcutorture/bin/functions.sh | |
| parent | torture: Add config2csv.sh script to compare torture scenarios (diff) | |
| download | linux-dev-106cc0d9e79aa7fcb43bd8feab97ee6e114d348b.tar.xz linux-dev-106cc0d9e79aa7fcb43bd8feab97ee6e114d348b.zip | |
tools/rcutorture: Make identify_qemu_vcpus() independent of local language
The rcutorture scripts' identify_qemu_vcpus() function expects `lscpu`
to have a "CPU: " line, for example:
CPU(s): 8
But different local language settings can give different results:
Processeur(s) : 8
As a result, identify_qemu_vcpus() may return an empty string, resulting
in the following warning (with the same local language settings):
kvm-test-1-run.sh: ligne 138 : test: : nombre entier attendu comme expression
This commit therefore changes identify_qemu_vcpus() to use getconf,
which produces local-language-independend output.
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: rcu@vger.kernel.org
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/functions.sh')
| -rw-r--r-- | tools/testing/selftests/rcutorture/bin/functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh index 82663495fb38..fef8b4b55c27 100644 --- a/tools/testing/selftests/rcutorture/bin/functions.sh +++ b/tools/testing/selftests/rcutorture/bin/functions.sh @@ -232,7 +232,7 @@ identify_qemu_args () { # Returns the number of virtual CPUs available to the aggregate of the # guest OSes. identify_qemu_vcpus () { - lscpu | grep '^CPU(s):' | sed -e 's/CPU(s)://' -e 's/[ ]*//g' + getconf _NPROCESSORS_ONLN } # print_bug |