From 144a76262155a6b2f866746c980459729db73544 Mon Sep 17 00:00:00 2001 From: Sonia Sharma Date: Fri, 1 Dec 2017 03:25:48 -0800 Subject: [PATCH] LU-10210 tests: Add lustre_routes_conversion script in PATH When running out of build tree test_67 in conf-sanity.sh cannot find lustre_routes_conversion script because it's not in PATH. Add lustre_routes_conversion script in test-framework.sh init_test_env() so that it is visible when running out of build tree. Test-Parameters: trivial testlist=conf-sanity Change-Id: Id5ed93e0176f0b42aa704511c72fbe14902ea42f Signed-off-by: Sonia Sharma Reviewed-on: https://review.whamcloud.com/30335 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 2 +- lustre/tests/test-framework.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 57e6ed2..14255b3 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4779,7 +4779,7 @@ test_67() { #LU-2950 lctl --net tcp4 add_route 10.3.3.4@tcp 1 3 VERIFY_LNET_CONFIG - lustre_routes_conversion $legacy $new > /dev/null + $LUSTRE_ROUTES_CONVERSION $legacy $new > /dev/null if [ -f $new ]; then # verify the conversion output cmp -s $new $verify > /dev/null diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 509041d..bb7f56c 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -292,6 +292,9 @@ init_test_env() { export LUSTRE_RMMOD=${LUSTRE_RMMOD:-$LUSTRE/scripts/lustre_rmmod} [ ! -f "$LUSTRE_RMMOD" ] && export LUSTRE_RMMOD=$(which lustre_rmmod 2> /dev/null) + export LUSTRE_ROUTES_COVERSION=${LUSTRE_ROUTES_CONVERSION:-$LUSTRE/scripts/lustre_routes_conversion} + [ ! -f "$LUSTRE_ROUTES_CONVERSION" ] && + export LUSTRE_ROUTES_CONVERSION=$(which lustre_routes_conversion 2> /dev/null) export LFS_MIGRATE=${LFS_MIGRATE:-$LUSTRE/scripts/lfs_migrate} [ ! -f "$LFS_MIGRATE" ] && export LFS_MIGRATE=$(which lfs_migrate 2> /dev/null) -- 1.8.3.1