From: John L. Hammond <john.hammond@intel.com>
Date: Fri, 4 Oct 2013 16:56:43 +0000 (-0500)
Subject: LU-4066 test: use $LUSTRE to locate server modules
X-Git-Tag: 2.5.51~51
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F7854%2F2;p=fs%2Flustre-release.git

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 <john.hammond@intel.com>
Change-Id: Ib16eee4d7811afcb310c7b0fd4a401ea5af2e7ad
Reviewed-on: http://review.whamcloud.com/7854
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

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