From 99cff8350bc0496c4980d6bd39762ea71fff5dd0 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 26 Mar 2020 09:30:52 -0400 Subject: [PATCH] test: remove SPDK_TEST_EVENT flag Test in event.sh take 5 seconds on CI at this time. For the tests to run both SPDK_RUN_FUNCTIONAL_TEST and SPDK_TEST_EVENT had to be enabled. This served as very minor time saver, so removing this flag shouldn't affter test times more that the 5 seconds. Signed-off-by: Tomasz Zawadzki Change-Id: Ie3eaa587daf28b2efbc3cfdff5ad648b7529e7f1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1493 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris --- autotest.sh | 5 +---- scripts/vagrant/autorun-spdk.conf | 1 - test/common/autotest_common.sh | 1 - test/common/config/vm_setup.sh | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/autotest.sh b/autotest.sh index 2fc9d7622..74a357e69 100755 --- a/autotest.sh +++ b/autotest.sh @@ -158,6 +158,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then run_test "alias_rpc" test/json_config/alias_rpc/alias_rpc.sh run_test "spdkcli_tcp" test/spdkcli/tcp.sh run_test "dpdk_mem_utility" test/dpdk_memory_utility/test_dpdk_mem_info.sh + run_test "event" test/event/event.sh if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then run_test "blockdev_general" test/bdev/blockdev.sh @@ -168,10 +169,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then run_test "test_converter" test/config_converter/test_converter.sh fi - if [ $SPDK_TEST_EVENT -eq 1 ]; then - run_test "event" test/event/event.sh - fi - if [ $SPDK_TEST_NVME -eq 1 ]; then run_test "blockdev_nvme" test/bdev/blockdev.sh "nvme" run_test "blockdev_nvme_gpt" test/bdev/blockdev.sh "gpt" diff --git a/scripts/vagrant/autorun-spdk.conf b/scripts/vagrant/autorun-spdk.conf index 58260fdcb..fa40d1dca 100644 --- a/scripts/vagrant/autorun-spdk.conf +++ b/scripts/vagrant/autorun-spdk.conf @@ -18,7 +18,6 @@ SPDK_TEST_VHOST_INIT=0 SPDK_TEST_BLOCKDEV=1 # doesn't work on vm SPDK_TEST_IOAT=0 -SPDK_TEST_EVENT=1 SPDK_TEST_BLOBFS=0 SPDK_TEST_PMDK=0 SPDK_TEST_LVOL=0 diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index e0c50eb0a..884167161 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -76,7 +76,6 @@ export RUN_NIGHTLY_FAILING : ${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 diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 46ea08520..af9c61ac0 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -704,7 +704,6 @@ SPDK_TEST_NVME_CLI=1 SPDK_TEST_NVMF=1 SPDK_TEST_RBD=1 SPDK_TEST_BLOCKDEV=1 -SPDK_TEST_EVENT=1 SPDK_TEST_BLOBFS=1 SPDK_TEST_PMDK=1 SPDK_TEST_LVOL=1