From eede31251e5d3ccdfa74366dddc10f8d8b2b54cd Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Fri, 7 Aug 2020 14:32:33 +1000 Subject: [PATCH] LU-13904 tests: don't assume echo_client is a module. The upstream lustre client can be compiled with all code in the kernel - no modules. So testing if the module is loaded gets incorrect results. So add a test to see if the functionalty is already present, and don't load a module if none is needed. Signed-off-by: Mr NeilBrown Change-Id: Id630107d57f473dfdc21687a4964e1ca4c83efe4 Reviewed-on: https://review.whamcloud.com/39655 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index c3ae827..521dc85 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -15778,7 +15778,8 @@ obdecho_test() { test_180a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" - if ! module_loaded obdecho; then + if ! [ -d /sys/fs/lustre/echo_client ] && + ! module_loaded obdecho; then load_module obdecho/obdecho && stack_trap "rmmod obdecho" EXIT || error "unable to load obdecho on client" -- 1.8.3.1