test/nvmf: shorten nightly nvmf+pmem test

This test ran for 10 minutes, which is half of the allotted time for the
entire nightly test run.

While we're here, remove some of the duplication - we don't need to run
both the nightly long run and the shorter normal test run of the same
test, and they should be grouped together.

Change-Id: I66385054d425fb8b032e282050fd39e927a8eb80
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/393095
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2017-12-27 09:46:22 -07:00 committed by Jim Harris
parent f95dacd504
commit 75bb8a5c5f

View File

@ -30,17 +30,17 @@ run_test test/nvmf/lvol/nvmf_lvol.sh
run_test test/nvmf/shutdown/shutdown.sh run_test test/nvmf/shutdown/shutdown.sh
if [ $SPDK_TEST_NVML -eq 1 ]; then if [ $SPDK_TEST_NVML -eq 1 ]; then
if [ $RUN_NIGHTLY -eq 1 ]; then
run_test test/nvmf/pmem/nvmf_pmem.sh 30
else
run_test test/nvmf/pmem/nvmf_pmem.sh 10 run_test test/nvmf/pmem/nvmf_pmem.sh 10
fi fi
fi
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then
run_test test/nvmf/multiconnection/multiconnection.sh run_test test/nvmf/multiconnection/multiconnection.sh
fi fi
if [ $RUN_NIGHTLY -eq 1 ] && [ $SPDK_TEST_NVML -eq 1 ]; then
run_test test/nvmf/pmem/nvmf_pmem.sh 600
fi
timing_enter host timing_enter host
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then