From 03402efd43de6bcac250a7e8ca5e624d9afdbda7 Mon Sep 17 00:00:00 2001
From: Jun Wen <junx.wen@intel.com>
Date: Thu, 23 Jun 2022 14:40:19 +0800
Subject: [PATCH] test/nvmf: Adaption for nvmf-llvm-fuzz test to per-patch CI
 pipeline job

Signed-off-by: Jun Wen <junx.wen@intel.com>
Change-Id: If76f5c8259b0e96b34cbb99fe8953660c6d5d520
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13440
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: <qun.wan@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Dong Yi <dongx.yi@intel.com>
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
---
 test/common/autotest_common.sh     |  2 ++
 test/nvmf/nvmf.sh                  |  7 ++++---
 test/nvmf/target/llvm_nvme_fuzz.sh | 17 +++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 4a7dff836..d9593f59d 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -105,6 +105,8 @@ export SPDK_TEST_VFIOUSER
 export SPDK_TEST_VFIOUSER_QEMU
 : ${SPDK_TEST_FUZZER=0}
 export SPDK_TEST_FUZZER
+: ${SPDK_TEST_FUZZER_SHORT=0}
+export SPDK_TEST_FUZZER_SHORT
 : ${SPDK_TEST_NVMF_TRANSPORT="rdma"}
 export SPDK_TEST_NVMF_TRANSPORT
 : ${SPDK_TEST_RBD=0}
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index dd7bd232e..ba3018774 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -13,6 +13,10 @@ trap "exit 1" SIGINT SIGTERM EXIT
 
 TEST_ARGS=("$@")
 
+if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
+	run_test "nvmf_llvm_fuzz" test/nvmf/target/llvm_nvme_fuzz.sh "${TEST_ARGS[@]}"
+fi
+
 if [[ $SPDK_TEST_URING -eq 0 ]]; then
 	run_test "nvmf_example" test/nvmf/target/nvmf_example.sh "${TEST_ARGS[@]}"
 	run_test "nvmf_filesystem" test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}"
@@ -48,9 +52,6 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 	run_test "nvmf_fuzz" test/nvmf/target/fabrics_fuzz.sh "${TEST_ARGS[@]}"
 	run_test "nvmf_multiconnection" test/nvmf/target/multiconnection.sh "${TEST_ARGS[@]}"
 	run_test "nvmf_initiator_timeout" test/nvmf/target/initiator_timeout.sh "${TEST_ARGS[@]}"
-	if [ $SPDK_TEST_FUZZER -eq 1 ]; then
-		run_test "nvmf_llvm_fuzz" test/nvmf/target/llvm_nvme_fuzz.sh "${TEST_ARGS[@]}" "--time=60000" "--all"
-	fi
 fi
 
 run_test "nvmf_nmic" test/nvmf/target/nmic.sh "${TEST_ARGS[@]}"
diff --git a/test/nvmf/target/llvm_nvme_fuzz.sh b/test/nvmf/target/llvm_nvme_fuzz.sh
index 3b44d46b5..959c1c9a7 100755
--- a/test/nvmf/target/llvm_nvme_fuzz.sh
+++ b/test/nvmf/target/llvm_nvme_fuzz.sh
@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-TIME=10
-RUN_ALL=0
+if [[ $SPDK_TEST_FUZZER_SHORT -eq 0 ]]; then
+	TIME=60000
+else
+	TIME=1
+fi
+
 for i in "$@"; do
 	case "$i" in
 		--time=*)
 			TIME="${i#*=}"
 			;;
-		--all)
-			RUN_ALL=1
-			;;
 	esac
 done
 
@@ -54,7 +55,11 @@ trap 'process_shm --id 0; rm -rf /tmp/llvm_fuzz*; exit 1' SIGINT SIGTERM EXIT
 
 trid="trtype:tcp adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:127.0.0.1 trsvcid:4420"
 
-if [[ $RUN_ALL -eq 1 ]]; then
+if [[ $SPDK_TEST_FUZZER_SHORT -eq 1 ]]; then
+	for ((i = 0; i < fuzz_num; i++)); do
+		start_llvm_fuzz $i
+	done
+elif [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
 	run_fuzz
 else
 	start_llvm_fuzz $1