Commit 08e8dd5c authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

test/blobstore: move blobstore tests to LVOL test flag 



Since SPDK_TEST_BLOBFS was never enabled after switch to spdk-ci, tests that
fell under this test flag did not execute. They are generic blobstore tests,
not related to blobfs.

Bunched them up with lvol tests as they have the same set of requirements to
execute.

Removed the SPDK_TEST_BLOBFS as it is no longer used.

Change-Id: I201fc9902660e67c07d827cbbff246a97d675f10
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26543


Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarMateusz Kozlowski <mateusz.kozlowski@solidigm.com>
parent 43a0f063

autotest.sh

+4 −7
Original line number Diff line number Diff line
@@ -265,13 +265,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		run_test "spdkcli_iscsi" $rootdir/test/spdkcli/iscsi.sh

	fi



	if [ $SPDK_TEST_BLOBFS -eq 1 ]; then

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

		run_test "blobstore_grow" $rootdir/test/blobstore/blobstore_grow/blobstore_grow.sh

		run_test "hello_blob" $SPDK_EXAMPLE_DIR/hello_blob \

			examples/blob/hello_world/hello_blob.json

	fi



	if [ $SPDK_TEST_NVMF -eq 1 ]; then

		export NET_TYPE

		# The NVMe-oF run test cases are split out like this so that the parser that compiles the
@@ -316,6 +309,10 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	fi



	if [ $SPDK_TEST_LVOL -eq 1 ]; then

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

		run_test "blobstore_grow" $rootdir/test/blobstore/blobstore_grow/blobstore_grow.sh

		run_test "hello_blob" $SPDK_EXAMPLE_DIR/hello_blob \

			examples/blob/hello_world/hello_blob.json

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

		run_test "blob_io_wait" $rootdir/test/blobstore/blob_io_wait/blob_io_wait.sh

	fi

scripts/vagrant/autorun-spdk.conf

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ SPDK_TEST_USDT=0 
SPDK_TEST_DAOS=0

# doesn't work on vm

SPDK_TEST_IOAT=0

SPDK_TEST_BLOBFS=0

SPDK_TEST_LVOL=0

SPDK_RUN_ASAN=1

SPDK_RUN_UBSAN=1

test/common/autotest_common.sh

+0 −2
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ export SPDK_TEST_BLOCKDEV 
export SPDK_TEST_RAID

: ${SPDK_TEST_IOAT=0}

export SPDK_TEST_IOAT

: ${SPDK_TEST_BLOBFS=0}

export SPDK_TEST_BLOBFS

: ${SPDK_TEST_VHOST_INIT=0}

export SPDK_TEST_VHOST_INIT

: ${SPDK_TEST_LVOL=0}

test/common/skipped_tests.txt

+0 −3
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ autobuild 
autobuild_external_code

autobuild_llvm_precompile

bdev_crypto_enomem

blobstore

blobstore_grow

blockdev_crypto_aesni

blockdev_crypto_qat

blockdev_crypto_sw
@@ -137,7 +135,6 @@ external_run_nvme_static 
framework_get_governor

go_rpc

guess_driver

hello_blob

hugepages

idle

interrupt_mode