From 11e94090d8f10c2e7d5c40faf028b21dc501d1c3 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Fri, 4 Oct 2013 11:56:43 -0500 Subject: [PATCH] LU-4066 test: use $LUSTRE to locate server modules In test-framework.sh's init_test_env look for $LUSTRE/mdt/mdt.ko rather than `$dirname $0`/../mdt/mdt.ko to determine if the server modules are present when they cannot be found in /lib/modules. Signed-off-by: John L. Hammond Change-Id: Ib16eee4d7811afcb310c7b0fd4a401ea5af2e7ad Reviewed-on: http://review.whamcloud.com/7854 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Emoly Liu Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index c348dfa..50bb524 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -291,13 +291,13 @@ init_test_env() { export RLUSTRE=${RLUSTRE:-$LUSTRE} export RPWD=${RPWD:-$PWD} export I_MOUNTED=${I_MOUNTED:-"no"} - if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mdt.ko -a \ - ! -f /lib/modules/$(uname -r)/updates/kernel/fs/lustre/mdt.ko -a \ - ! -f `dirname $0`/../mdt/mdt.ko ]; then - export CLIENTMODSONLY=yes - fi + if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mdt.ko -a \ + ! -f /lib/modules/$(uname -r)/updates/kernel/fs/lustre/mdt.ko -a \ + ! -f $LUSTRE/mdt/mdt.ko ]; then + export CLIENTMODSONLY=yes + fi - export SHUTDOWN_ATTEMPTS=${SHUTDOWN_ATTEMPTS:-3} + export SHUTDOWN_ATTEMPTS=${SHUTDOWN_ATTEMPTS:-3} export OSD_TRACK_DECLARES_LBUG=${OSD_TRACK_DECLARES_LBUG:-"yes"} # command line -- 1.8.3.1