Commit 7d6e0802 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/iscsi: remove SPDK_TEST_VPP test flag 



Signed-off-by: default avatarTomasz 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 4eda51a0

autotest.sh

+0 −4
Original line number Diff line number Diff line
@@ -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

test/common/autotest_common.sh

+0 −12
Original line number Diff line number Diff line
@@ -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'

test/iscsi_tgt/common.sh

+0 −3
Original line number Diff line number Diff line
@@ -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() {

test/iscsi_tgt/sock/sock.sh

+0 −3
Original line number Diff line number Diff line
@@ -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"



# ----------------