From 7d6e0802a37a568872977829b6ea01a4be40534b Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Tue, 11 Aug 2020 06:49:55 -0400
Subject: [PATCH] test/iscsi: remove SPDK_TEST_VPP test flag

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I8f8366337591a990bda4af60ea5e15d92b07b61c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3731
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 autotest.sh                    |  4 ----
 test/common/autotest_common.sh | 12 ------------
 test/iscsi_tgt/common.sh       |  3 ---
 test/iscsi_tgt/sock/sock.sh    |  3 ---
 4 files changed, 22 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 41acee59d..4bafac9c9 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -217,10 +217,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 		run_test "spdkcli_raid" test/spdkcli/raid.sh
 	fi
 
-	if [ $SPDK_TEST_VPP -eq 1 ]; then
-		run_test "iscsi_tgt_vpp" ./test/iscsi_tgt/iscsi_tgt.sh vpp
-	fi
-
 	if [ $SPDK_TEST_BLOBFS -eq 1 ]; then
 		run_test "rocksdb" ./test/blobfs/rocksdb/rocksdb.sh
 		run_test "blobstore" ./test/blobstore/blobstore.sh
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index b2a638e4e..ce82ddd11 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -100,8 +100,6 @@ export SPDK_TEST_LVOL
 export SPDK_TEST_JSON
 : ${SPDK_TEST_REDUCE=0}
 export SPDK_TEST_REDUCE
-: ${SPDK_TEST_VPP=0}
-export SPDK_TEST_VPP
 : ${SPDK_RUN_ASAN=0}
 export SPDK_RUN_ASAN
 : ${SPDK_RUN_UBSAN=0}
@@ -238,12 +236,6 @@ if [[ -z $RPC_PIPE_PID ]] || ! kill -0 "$RPC_PIPE_PID" &> /dev/null; then
 	# process, this will make rpc.py stop reading and exit gracefully
 fi
 
-if [ $SPDK_TEST_VPP -eq 1 ]; then
-	VPP_PATH="/usr/local/src/vpp-19.04/build-root/install-vpp_debug-native/vpp/"
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${VPP_PATH}/lib/
-	export PATH=${PATH}:${VPP_PATH}/bin/
-fi
-
 function set_test_storage() {
 	[[ -v testdir ]] || return 0
 
@@ -381,10 +373,6 @@ function get_config_params() {
 		config_params+=' --with-rbd'
 	fi
 
-	if [ $SPDK_TEST_VPP -eq 1 ]; then
-		config_params+=" --with-vpp=${VPP_PATH}"
-	fi
-
 	# for options with no required dependencies, just test flags, set them here
 	if [ $SPDK_TEST_CRYPTO -eq 1 ]; then
 		config_params+=' --with-crypto'
diff --git a/test/iscsi_tgt/common.sh b/test/iscsi_tgt/common.sh
index 53b261b38..d60f0dffb 100644
--- a/test/iscsi_tgt/common.sh
+++ b/test/iscsi_tgt/common.sh
@@ -13,9 +13,6 @@ INITIATOR_TAG=2
 INITIATOR_NAME=ANY
 PORTAL_TAG=1
 ISCSI_APP=("${TARGET_NS_CMD[@]}" "${ISCSI_APP[@]}")
-if [ $SPDK_TEST_VPP -eq 1 ]; then
-	ISCSI_APP+=(-L sock_vpp)
-fi
 ISCSI_TEST_CORE_MASK=0xFF
 
 function create_veth_interfaces() {
diff --git a/test/iscsi_tgt/sock/sock.sh b/test/iscsi_tgt/sock/sock.sh
index ac21ebd96..9d8dcef25 100755
--- a/test/iscsi_tgt/sock/sock.sh
+++ b/test/iscsi_tgt/sock/sock.sh
@@ -81,9 +81,6 @@ if [ "$TEST_TYPE" != "posix" ] && [ "$TEST_TYPE" != "vpp" ]; then
 fi
 
 HELLO_SOCK_APP="${TARGET_NS_CMD[*]} $SPDK_EXAMPLE_DIR/hello_sock"
-if [ $SPDK_TEST_VPP -eq 1 ]; then
-	HELLO_SOCK_APP+=" -L sock_vpp"
-fi
 SOCAT_APP="socat"
 
 # ----------------