From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750903AbdFSNo2 (ORCPT ); Mon, 19 Jun 2017 09:44:28 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:33074 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbdFSNo0 (ORCPT ); Mon, 19 Jun 2017 09:44:26 -0400 From: Sumit Semwal To: shuah@kernel.org, linux-kselftest@vger.kernel.org Cc: keescook@chromium.org, decot@googlers.com, linux-kernel@vger.kernel.org, Sumit Semwal Subject: [PATCH v2 1/2] selftests: lib: Skip tests on missing test modules Date: Mon, 19 Jun 2017 19:14:11 +0530 Message-Id: <1497879851-11057-1-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With older kernels, printf.sh and bitmap.sh fail because they can't find the respective test modules they are looking for. Add the skip portion on missing the respective test_XXX module. Error out with the same error code as prime_numbers.sh. v2: Per Shuah's review, search for the module rather than do modprobe. Signed-off-by: Sumit Semwal --- tools/testing/selftests/lib/bitmap.sh | 6 ++++++ tools/testing/selftests/lib/printf.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/lib/bitmap.sh b/tools/testing/selftests/lib/bitmap.sh index 2da187b6ddad..b893046d511f 100755 --- a/tools/testing/selftests/lib/bitmap.sh +++ b/tools/testing/selftests/lib/bitmap.sh @@ -1,6 +1,12 @@ #!/bin/sh # Runs bitmap infrastructure tests using test_bitmap kernel module +if ! find /lib/modules/$(uname -r) -type f -name test_bitmap.ko | grep -q .; +then + echo "bitmap: test_bitmap.ko not found [SKIP]" + exit 77 +fi + if /sbin/modprobe -q test_bitmap; then /sbin/modprobe -q -r test_bitmap echo "bitmap: ok" diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh index 4fdc70fe6980..804b7e75acc0 100755 --- a/tools/testing/selftests/lib/printf.sh +++ b/tools/testing/selftests/lib/printf.sh @@ -1,6 +1,12 @@ #!/bin/sh # Runs printf infrastructure using test_printf kernel module +if ! find /lib/modules/$(uname -r) -type f -name test_printf.ko | grep -q .; +then + echo "printf: test_printf.ko not found [SKIP]" + exit 77 +fi + if /sbin/modprobe -q test_printf; then /sbin/modprobe -q -r test_printf echo "printf: ok" -- 2.7.4