From 75bb8a5c5f3072f5a2d2a17ab4195307be41d9be Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 27 Dec 2017 09:46:22 -0700 Subject: [PATCH] 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 Reviewed-on: https://review.gerrithub.io/393095 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Jim Harris --- test/nvmf/nvmf.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 91675b639..1f979371d 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -30,17 +30,17 @@ run_test test/nvmf/lvol/nvmf_lvol.sh run_test test/nvmf/shutdown/shutdown.sh if [ $SPDK_TEST_NVML -eq 1 ]; then - run_test test/nvmf/pmem/nvmf_pmem.sh 10 + 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 + fi fi if [ $RUN_NIGHTLY -eq 1 ]; then run_test test/nvmf/multiconnection/multiconnection.sh 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 if [ $RUN_NIGHTLY -eq 1 ]; then