From 7ef497012a2095ae841482b5e7433cfbeda7a9d3 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 2 Jun 2020 13:20:18 -0700 Subject: [PATCH] test/nvme: move nvme_fio test before kill_stub call This test was after the part in the nvme.sh script where we kill the stub. So the call to get_nvme_bdfs was invariably returning nothing. Signed-off-by: Seth Howell Change-Id: Ice98cca8878ccff06057da5f96607eccffc5da39 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2746 Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- test/nvme/nvme.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh index 4632e25f8..f115492e8 100755 --- a/test/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -118,13 +118,13 @@ run_test "nvme_err_injection" $testdir/err_injection/err_injection run_test "nvme_overhead" $testdir/overhead/overhead -s 4096 -t 1 -H run_test "nvme_arbitration" $rootdir/examples/nvme/arbitration/arbitration -t 3 -i 0 +if [[ $CONFIG_FIO_PLUGIN == y ]]; then + run_test "nvme_fio" nvme_fio_test +fi + if [ $(uname) != "FreeBSD" ]; then run_test "nvme_startup" $testdir/startup/startup -t 1000000 run_test "nvme_multi_secondary" nvme_multi_secondary trap - SIGINT SIGTERM EXIT kill_stub fi - -if [[ $CONFIG_FIO_PLUGIN == y ]]; then - run_test "nvme_fio" nvme_fio_test -fi