LU-2734 tests: Remove XXXDEV overrides in init_facets_vars()

init_facets_vars() assigns outputs of xxxdevname() calls to XXXDEVs.
This is incorrect because XXXDEVs are supposed to contain device names
while xxxdevname() calls may print dataset names for ZFS-based facets.
Actually, XXXDEV should not be changed at all.  This patch removes the
XXXDEV assignments.

Change-Id: Id484390cbd814c6fa919c02e390700f914561434
Signed-off-by: Li Wei <wei.g.li@intel.com>
Reviewed-on: http://review.whamcloud.com/5243
Tested-by: Hudson
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 26dda7b..4da5ca5 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3155,18 +3155,15 @@ init_facets_vars () {
        if ! remote_mds_nodsh; then
                for num in $(seq $MDSCOUNT); do
                        DEVNAME=`mdsdevname $num`
-                       eval export MDSDEV${num}=$DEVNAME
                        init_facet_vars mds$num $DEVNAME $MDS_MOUNT_OPTS
                done
        fi
 
-       eval export MGSDEV=$(mgsdevname)
        combined_mgs_mds || init_facet_vars mgs $(mgsdevname) $MGS_MOUNT_OPTS
 
        if ! remote_ost_nodsh; then
                for num in $(seq $OSTCOUNT); do
                        DEVNAME=$(ostdevname $num)
-                       eval export OSTDEV${num}=$DEVNAME
                        init_facet_vars ost$num $DEVNAME $OST_MOUNT_OPTS
                done
        fi