From 0560976d517eada3c4876e36df57c6a1dae99729 Mon Sep 17 00:00:00 2001 From: Pawel Niedzwiecki Date: Thu, 7 Feb 2019 13:22:12 +0100 Subject: [PATCH] test/common: Disable autotest options by default. By default most of the tests are enabled, if we want to run only tests that interests us, we need to disable each flag separatly. Build SPDK without additional dependencies and exit autotest.sh early if no test configuration file is provided. Change-Id: Id4752689479d9325242364c39c89d1236bab0344 Signed-off-by: Pawel Niedzwiecki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/443762 Reviewed-by: Pawel Kaminski Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- autotest.sh | 8 +++++ test/common/autotest_common.sh | 58 +++++++++++++++++----------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/autotest.sh b/autotest.sh index 64ab8d853..98c32f0fe 100755 --- a/autotest.sh +++ b/autotest.sh @@ -1,6 +1,14 @@ #!/usr/bin/env bash rootdir=$(readlink -f $(dirname $0)) + +# In autotest_common.sh all tests are disabled by default. +# If the configuration of tests is not provided, no tests will be carried out. +if [[ -z $1 ]]; then + echo "SPDK test configuration not specified" + exit 1 +fi + source "$rootdir/test/common/autotest_common.sh" source "$rootdir/test/nvmf/common.sh" diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 48dfe235f..e12413643 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -34,37 +34,37 @@ if ! hash pmempool; then fi # Set defaults for missing test config options -: ${SPDK_BUILD_DOC=1}; export SPDK_BUILD_DOC -: ${SPDK_BUILD_SHARED_OBJECT=1}; export SPDK_BUILD_SHARED_OBJECT -: ${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 -: ${SPDK_TEST_ISCSI_INITIATOR=1}; export SPDK_TEST_ISCSI_INITIATOR -: ${SPDK_TEST_NVME=1}; export SPDK_TEST_NVME -: ${SPDK_TEST_NVME_CLI=1}; export SPDK_TEST_NVME_CLI -: ${SPDK_TEST_NVMF=1}; export SPDK_TEST_NVMF -: ${SPDK_TEST_RBD=1}; export SPDK_TEST_RBD -: ${SPDK_TEST_VHOST=1}; export SPDK_TEST_VHOST -: ${SPDK_TEST_BLOCKDEV=1}; export SPDK_TEST_BLOCKDEV -: ${SPDK_TEST_IOAT=1}; export SPDK_TEST_IOAT -: ${SPDK_TEST_EVENT=1}; export SPDK_TEST_EVENT -: ${SPDK_TEST_BLOBFS=1}; export SPDK_TEST_BLOBFS -: ${SPDK_TEST_VHOST_INIT=1}; export SPDK_TEST_VHOST_INIT -: ${SPDK_TEST_PMDK=1}; export SPDK_TEST_PMDK -: ${SPDK_TEST_LVOL=1}; export SPDK_TEST_LVOL -: ${SPDK_TEST_JSON=1}; export SPDK_TEST_JSON -: ${SPDK_TEST_REDUCE=1}; export SPDK_TEST_REDUCE -: ${SPDK_RUN_ASAN=1}; export SPDK_RUN_ASAN -: ${SPDK_RUN_UBSAN=1}; export SPDK_RUN_UBSAN -: ${SPDK_RUN_INSTALLED_DPDK=1}; export SPDK_RUN_INSTALLED_DPDK -: ${SPDK_TEST_CRYPTO=1}; export SPDK_TEST_CRYPTO +: ${SPDK_BUILD_DOC=0}; export SPDK_BUILD_DOC +: ${SPDK_BUILD_SHARED_OBJECT=0}; export SPDK_BUILD_SHARED_OBJECT +: ${SPDK_RUN_CHECK_FORMAT=0}; export SPDK_RUN_CHECK_FORMAT +: ${SPDK_RUN_SCANBUILD=0}; export SPDK_RUN_SCANBUILD +: ${SPDK_RUN_VALGRIND=0}; export SPDK_RUN_VALGRIND +: ${SPDK_RUN_FUNCTIONAL_TEST=0}; export SPDK_RUN_FUNCTIONAL_TEST +: ${SPDK_TEST_UNITTEST=0}; export SPDK_TEST_UNITTEST +: ${SPDK_TEST_ISAL=0}; export SPDK_TEST_ISAL +: ${SPDK_TEST_ISCSI=0}; export SPDK_TEST_ISCSI +: ${SPDK_TEST_ISCSI_INITIATOR=0}; export SPDK_TEST_ISCSI_INITIATOR +: ${SPDK_TEST_NVME=0}; export SPDK_TEST_NVME +: ${SPDK_TEST_NVME_CLI=0}; export SPDK_TEST_NVME_CLI +: ${SPDK_TEST_NVMF=0}; export SPDK_TEST_NVMF +: ${SPDK_TEST_RBD=0}; export SPDK_TEST_RBD +: ${SPDK_TEST_VHOST=0}; export SPDK_TEST_VHOST +: ${SPDK_TEST_BLOCKDEV=0}; export SPDK_TEST_BLOCKDEV +: ${SPDK_TEST_IOAT=0}; export SPDK_TEST_IOAT +: ${SPDK_TEST_EVENT=0}; export SPDK_TEST_EVENT +: ${SPDK_TEST_BLOBFS=0}; export SPDK_TEST_BLOBFS +: ${SPDK_TEST_VHOST_INIT=0}; export SPDK_TEST_VHOST_INIT +: ${SPDK_TEST_PMDK=0}; export SPDK_TEST_PMDK +: ${SPDK_TEST_LVOL=0}; export SPDK_TEST_LVOL +: ${SPDK_TEST_JSON=0}; export SPDK_TEST_JSON +: ${SPDK_TEST_REDUCE=0}; export SPDK_TEST_REDUCE +: ${SPDK_RUN_ASAN=0}; export SPDK_RUN_ASAN +: ${SPDK_RUN_UBSAN=0}; export SPDK_RUN_UBSAN +: ${SPDK_RUN_INSTALLED_DPDK=0}; export SPDK_RUN_INSTALLED_DPDK +: ${SPDK_TEST_CRYPTO=0}; export SPDK_TEST_CRYPTO : ${SPDK_TEST_FTL=0}; export SPDK_TEST_FTL : ${SPDK_TEST_BDEV_FTL=0}; export SPDK_TEST_BDEV_FTL -: ${SPDK_TEST_OCF=1}; export SPDK_TEST_OCF +: ${SPDK_TEST_OCF=0}; export SPDK_TEST_OCF : ${SPDK_TEST_FTL_EXTENDED=0}; export SPDK_TEST_FTL_EXTENDED if [ -z "$DEPENDENCY_DIR" ]; then