Commit e0001c6e authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/vhost: Drop HUGENODE from vhost/common.sh 



vhost/common.sh is used by different entities, including perf-based
ones. Having it inside common.sh affects overall setup which for perf
should not be touched in any way.

To that end, make sure single-node setup is requested explicitly from
autotest.

Change-Id: I8cbfa480bc960f404670fe9d2e3e838ae35c4ea5
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24406


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 41f614c4

autotest.sh

+7 −2
Original line number Diff line number Diff line
@@ -311,12 +311,17 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		fi

	fi



	# For vfio_user and vhost tests We need to make sure entire HUGEMEM default

	# goes to a single node as we share hugepages with qemu instance(s) and we

	# cannot split it across all numa nodes without making sure there's enough

	# memory available.



	if [ $SPDK_TEST_VHOST -eq 1 ]; then

		run_test "vhost" $rootdir/test/vhost/vhost.sh

		HUGENODE=0 run_test "vhost" $rootdir/test/vhost/vhost.sh --iso

	fi



	if [ $SPDK_TEST_VFIOUSER_QEMU -eq 1 ]; then

		run_test "vfio_user_qemu" $rootdir/test/vfio_user/vfio_user.sh

		HUGENODE=0 run_test "vfio_user_qemu" $rootdir/test/vfio_user/vfio_user.sh --iso

	fi



	if [ $SPDK_TEST_LVOL -eq 1 ]; then

test/vhost/common.sh

+0 −7
Original line number Diff line number Diff line
@@ -33,13 +33,6 @@ mkdir -p $TARGET_DIR 
source $rootdir/test/vhost/common/autotest.config

source "$rootdir/test/scheduler/common.sh"



if is_numa; then

	# We need to make sure entire HUGEMEM default goes to a single node as

	# we share hugepages with qemu instance(s) and we cannot split it across

	# all numa nodes without making sure there's enough memory available.

	HUGENODE=0 "$rootdir/scripts/setup.sh"

fi



function vhosttestinit() {

	if [ "$TEST_MODE" == "iso" ]; then

		$rootdir/scripts/setup.sh