From 5f2844382132314b9890ffac895242cd69a7b65f Mon Sep 17 00:00:00 2001 From: GangCao Date: Tue, 4 Jun 2019 15:48:04 -0400 Subject: [PATCH] test/vhost: fix includes in the migration test Fix the following nightly failure: > migration.sh: line 56: vhosttestinit: command not found Change-Id: I56135c2a83de2455238eb7d40de973459019d63b Signed-off-by: GangCao Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456758 Reviewed-by: Darek Stojaczyk Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- test/vhost/migration/migration.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/vhost/migration/migration.sh b/test/vhost/migration/migration.sh index 0a9e1230d..96b5f6e39 100755 --- a/test/vhost/migration/migration.sh +++ b/test/vhost/migration/migration.sh @@ -2,6 +2,11 @@ set -e +testdir=$(readlink -f $(dirname $0)) +rootdir=$(readlink -f $testdir/../../..) +source $rootdir/test/common/autotest_common.sh +source $rootdir/test/vhost/common.sh + vms=() declare -A vms_os declare -A vms_raw_disks @@ -55,9 +60,6 @@ done vhosttestinit -. $(readlink -e "$(dirname $0)/../common.sh") || exit 1 -MIGRATION_DIR=$(readlink -f $(dirname $0)) - [[ ! -z "$test_cases" ]] || fail "Need '--test-cases=' parameter" trap 'error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT @@ -143,7 +145,7 @@ for test_case in ${test_cases//,/ }; do notice "===============================" timing_enter migration-tc${test_case} - source $MIGRATION_DIR/migration-tc${test_case}.sh + source $testdir/migration-tc${test_case}.sh timing_exit migration-tc${test_case} done