Commit 8604e568 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Jim Harris
Browse files

autotest: introduce SPDK_RUN_FUNCTIONAL_TEST 



Introduced a new variable to run functional tests.
It's enabled by default, and can be manually disabled
on systems where e.g. only unit tests are run.

SPDK_RUN_FUNCTIONAL_TEST is a supplement to SPDK_UNITTEST.
The two are completely independent - both can be enabled,
disabled, or run in any combination.

The new variable is prefixed SPDK_RUN_ as it aligns nicely
with SPDK_RUN_CHECK_FORMAT, SPDK_RUN_VALGRIND, and
SPDK_RUN_ASAN, all of which control how much is tested.
SPDK_UNITTEST should eventually follow the same pattern
as well.

This gives us 2 layers of configuration:
SPDK_TEST_* <- what is tested
SPDK_RUN_* <- how it is tested

The following would run UT+ASAN for FTL and BlobFS, without
running their functional tests:

```
SPDK_RUN_FUNCTIONAL_TEST=0
SPDK_RUN_ASAN=1
SPDK_TEST_UNITTEST=1
SPDK_TEST_FTL=1
SPDK_TEST_BLOBFS=1
```

Change-Id: I9e592fa41aa2df8e246eca2bb9161b6da6832130
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/442327


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ad272579

autotest.sh

+81 −79
Original line number Diff line number Diff line
@@ -105,8 +105,14 @@ if [ $SPDK_TEST_UNITTEST -eq 1 ]; then 
	timing_exit unittest

fi





if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then

	timing_enter lib



	run_test suite test/env/env.sh

	run_test suite test/rpc_client/rpc_client.sh

	run_test suite ./test/json_config/json_config.sh



	if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then

		run_test suite test/bdev/blockdev.sh

	fi
@@ -133,9 +139,6 @@ if [ $SPDK_TEST_NVME -eq 1 ]; then 
		#fi

	fi



run_test suite test/env/env.sh

run_test suite test/rpc_client/rpc_client.sh



	if [ $SPDK_TEST_IOAT -eq 1 ]; then

		run_test suite test/ioat/ioat.sh

	fi
@@ -200,8 +203,7 @@ fi 
	if [ $SPDK_TEST_BDEV_FTL -eq 1 ]; then

		run_test suite ./test/ftl/ftl.sh

	fi



run_test suite ./test/json_config/json_config.sh

fi



timing_enter cleanup

autotest_cleanup

scripts/vagrant/autorun-spdk.conf

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ SPDK_BUILD_DOC=1 
SPDK_RUN_CHECK_FORMAT=1

SPDK_RUN_SCANBUILD=1

SPDK_RUN_VALGRIND=1

SPDK_RUN_FUNCTIONAL_TEST=1

SPDK_TEST_UNITTEST=1

SPDK_TEST_ISAL=1

SPDK_TEST_ISCSI=0

test/common/autotest_common.sh

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ fi 
: ${SPDK_RUN_CHECK_FORMAT=1}; export SPDK_RUN_CHECK_FORMAT

: ${SPDK_RUN_SCANBUILD=1}; export SPDK_RUN_SCANBUILD

: ${SPDK_RUN_VALGRIND=1}; export SPDK_RUN_VALGRIND

: ${SPDK_RUN_FUNCTIONAL_TEST=1}; export SPDK_RUN_FUNCTIONAL_TEST

: ${SPDK_TEST_UNITTEST=1}; export SPDK_TEST_UNITTEST

: ${SPDK_TEST_ISAL=1}; export SPDK_TEST_ISAL

: ${SPDK_TEST_ISCSI=1}; export SPDK_TEST_ISCSI

test/common/config/vm_setup.sh

+1 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ SPDK_RUN_CHECK_FORMAT=1 
SPDK_RUN_SCANBUILD=1

SPDK_RUN_VALGRIND=1

SPDK_TEST_CRYPTO=1

SPDK_RUN_FUNCTIONAL_TEST=1

SPDK_TEST_UNITTEST=1

SPDK_TEST_ISCSI=1

SPDK_TEST_ISCSI_INITIATOR=1