diff mbox series

[29/35] selftests: kmod: fix handling test numbers above 9

Message ID	20200410213353.6PUa-fVba%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=L6kS=52=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6772521556 Date: Fri, 10 Apr 2020 14:33:53 -0700 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, ast@kernel.org, ebiggers@google.com, gregkh@linuxfoundation.org, jeffv@google.com, jeyu@kernel.org, keescook@chromium.org, linux-mm@kvack.org, mcgrof@kernel.org, mm-commits@vger.kernel.org, neilb@suse.com, torvalds@linux-foundation.org Subject: [patch 29/35] selftests: kmod: fix handling test numbers above 9 Message-ID: <20200410213353.6PUa-fVba%akpm@linux-foundation.org> In-Reply-To: <20200410143047.bf34a933ce1affdc042c7c80@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[01/35] hfsplus: fix crash and filesystem corruption when deleting files \| expand [01/35] hfsplus: fix crash and filesystem corruption when deleting files [02/35] mm, memcg: do not high throttle allocators based on wraparound [03/35] mm, slab_common: fix a typo in comment "eariler"->"earlier" [04/35] docs: mm: slab.h: fix a broken cross-reference [05/35] mm/page_alloc.c: fix kernel-doc warning [06/35] mm/page_alloc: make pcpu_drain_mutex and pcpu_drain static [07/35] mm/gup: fix null pointer dereference detected by coverity [08/35] ocfs2: no need try to truncate file beyond i_size [09/35] mm: cma: NUMA node interface [10/35] mm: hugetlb: optionally allocate gigantic hugepages using cma [11/35] mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area [12/35] mm/memory.c: refactor insert_page to prepare for batched-lock insert [13/35] mm: bring sparc pte_index() semantics inline with other platforms [14/35] mm: define pte_index as macro for x86 [15/35] mm/memory.c: add vm_insert_pages() [16/35] mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS [17/35] mm/vma: introduce VM_ACCESS_FLAGS [18/35] mm/special: create generic fallbacks for pte_special() and pte_mkspecial() [19/35] mm/memory_hotplug: drop the flags field from struct mhp_restrictions [20/35] mm/memory_hotplug: rename mhp_restrictions to mhp_params [21/35] x86/mm: thread pgprot_t through init_memory_mapping() [22/35] x86/mm: introduce __set_memory_prot() [23/35] powerpc/mm: thread pgprot_t through create_section_mapping() [24/35] mm/memory_hotplug: add pgprot_t to mhp_params [25/35] mm/memremap: set caching mode for PCI P2PDMA memory to WC [26/35] kmod: make request_module() return an error when autoloading is disabled [27/35] fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() [28/35] docs: admin-guide: document the kernel.modprobe sysctl [29/35] selftests: kmod: fix handling test numbers above 9 [30/35] selftests: kmod: test disabling module autoloading [31/35] change email address for Pali Rohár [32/35] drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings [33/35] fs/seq_file.c: seq_read(): add info message about buggy .next functions [34/35] kernel/gcov/fs.c: gcov_seq_next() should increase position index [35/35] ipc/util.c: sysvipc_find_ipc() should increase position index

Commit Message

Andrew Morton April 10, 2020, 9:33 p.m. UTC

From: Eric Biggers <ebiggers@google.com>
Subject: selftests: kmod: fix handling test numbers above 9

get_test_count() and get_test_enabled() were broken for test numbers above
9 due to awk interpreting a field specification like '$0010' as octal
rather than decimal.  Fix it by stripping the leading zeroes.

Link: http://lkml.kernel.org/r/20200318230515.171692-5-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jeff Vander Stoep <jeffv@google.com>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: NeilBrown <neilb@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 tools/testing/selftests/kmod/kmod.sh |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff mbox series

Patch

--- a/tools/testing/selftests/kmod/kmod.sh~selftests-kmod-fix-handling-test-numbers-above-9
+++ a/tools/testing/selftests/kmod/kmod.sh
@@ -505,18 +505,23 @@  function test_num()
 	fi
 }
 
-function get_test_count()
+function get_test_data()
 {
 	test_num $1
-	TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
+	local field_num=$(echo $1 | sed 's/^0*//')
+	echo $ALL_TESTS | awk '{print $'$field_num'}'
+}
+
+function get_test_count()
+{
+	TEST_DATA=$(get_test_data $1)
 	LAST_TWO=${TEST_DATA#*:*}
 	echo ${LAST_TWO%:*}
 }
 
 function get_test_enabled()
 {
-	test_num $1
-	TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
+	TEST_DATA=$(get_test_data $1)
 	echo ${TEST_DATA#*:*:}
 }