The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     d3cb26312ecfdb4ee8dedf931e24e60df1d7fbc9
Gitweb:        
https://git.kernel.org/tip/d3cb26312ecfdb4ee8dedf931e24e60df1d7fbc9
Author:        Paul E. McKenney <[email protected]>
AuthorDate:    Mon, 04 May 2020 16:40:53 -07:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 29 Jun 2020 12:01:44 -07:00

torture: Remove whitespace from identify_qemu_vcpus output

The identify_qemu_vcpus bash function can return numbers including
whitespace characters, which can be a bit annoying in some bash
dollar-sign substitutions.  This commit therefore strips all spaces and
tabs from the value that identify_qemu_vcpus outputs.

Signed-off-by: Paul E. McKenney <[email protected]>
---
 tools/testing/selftests/rcutorture/bin/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh 
b/tools/testing/selftests/rcutorture/bin/functions.sh
index 436b154..51f3464 100644
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -231,7 +231,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)://'
+       lscpu | grep '^CPU(s):' | sed -e 's/CPU(s)://' -e 's/[  ]*//g'
 }
 
 # print_bug

Reply via email to