From ad84526d1c94c1182cf3149acdbe692f038b9010 Mon Sep 17 00:00:00 2001 From: cunyinch Date: Sat, 27 May 2017 08:05:26 +0800 Subject: [PATCH] test/nvmf: move the nvmf test cases to the separate script. Change-Id: I14dcb4c37d19b9696e6ad1ee088b37e34efbf3ff Signed-off-by: cunyinch Reviewed-on: https://review.gerrithub.io/362809 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- autotest.sh | 27 +-------------------------- test/nvmf/nvmf.sh | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 26 deletions(-) create mode 100755 test/nvmf/nvmf.sh diff --git a/autotest.sh b/autotest.sh index 48307019e..c23d50ee3 100755 --- a/autotest.sh +++ b/autotest.sh @@ -115,32 +115,7 @@ if [ $SPDK_TEST_BLOBFS -eq 1 ]; then fi if [ $SPDK_TEST_NVMF -eq 1 ]; then - timing_enter nvmf - - run_test test/nvmf/fio/fio.sh - run_test test/nvmf/filesystem/filesystem.sh - run_test test/nvmf/discovery/discovery.sh - run_test test/nvmf/nvme_cli/nvme_cli.sh - run_test test/nvmf/shutdown/shutdown.sh - run_test test/nvmf/rpc/rpc.sh - - if [ $RUN_NIGHTLY -eq 1 ]; then - run_test test/nvmf/multiconnection/multiconnection.sh - fi - - timing_enter host - - if [ $RUN_NIGHTLY -eq 1 ]; then - run_test test/nvmf/host/aer.sh - fi - run_test test/nvmf/host/identify.sh - run_test test/nvmf/host/perf.sh - run_test test/nvmf/host/identify_kernel_nvmf.sh - run_test test/nvmf/host/fio.sh - - timing_exit host - - timing_exit nvmf + run_test ./test/nvmf/nvmf.sh fi if [ $SPDK_TEST_VHOST -eq 1 ]; then diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh new file mode 100755 index 000000000..3dc050447 --- /dev/null +++ b/test/nvmf/nvmf.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +testdir=$(readlink -f $(dirname $0)) +rootdir=$(readlink -f $testdir/../..) +source $rootdir/scripts/autotest_common.sh + +if [ ! $(uname -s) = Linux ]; then + exit 0 +fi + +source $rootdir/test/nvmf/common.sh + +timing_enter nvmf_tgt + +run_test test/nvmf/fio/fio.sh +run_test test/nvmf/filesystem/filesystem.sh +run_test test/nvmf/discovery/discovery.sh +run_test test/nvmf/nvme_cli/nvme_cli.sh +run_test test/nvmf/shutdown/shutdown.sh +run_test test/nvmf/rpc/rpc.sh + +if [ $RUN_NIGHTLY -eq 1 ]; then + run_test test/nvmf/multiconnection/multiconnection.sh +fi + +timing_enter host + +if [ $RUN_NIGHTLY -eq 1 ]; then + run_test test/nvmf/host/aer.sh +fi +run_test test/nvmf/host/identify.sh +run_test test/nvmf/host/perf.sh +run_test test/nvmf/host/identify_kernel_nvmf.sh +run_test test/nvmf/host/fio.sh + +timing_exit host + +timing_exit nvmf_tgt