From af761ab1677fa0c59819b8e87a5b95773a30d1ce Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 18 Jun 2020 09:00:24 -0400
Subject: [PATCH] test/nvme-cli: exit early when not running on Linux

Tests do not work on OS other than Linux, instead of
going through whole script - exit early with error.

Took this chance to move staring the stub, till after
nvme-cli compilation succeeds.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I5659888527bc2c25ab10bd871f7820b13f02e3fc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2947
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
---
 test/nvme/spdk_nvme_cli.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh
index eea1a8a20..ccd8222d5 100755
--- a/test/nvme/spdk_nvme_cli.sh
+++ b/test/nvme/spdk_nvme_cli.sh
@@ -5,6 +5,11 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/scripts/common.sh
 source $rootdir/test/common/autotest_common.sh
 
+if [[ $(uname) != "Linux" ]]; then
+	echo "NVMe cuse tests only supported on Linux"
+	exit 1
+fi
+
 if [ -z "${DEPENDENCY_DIR}" ]; then
 	echo DEPENDENCY_DIR not defined!
 	exit 1
@@ -17,17 +22,16 @@ if [ ! -d $spdk_nvme_cli ]; then
 	exit 1
 fi
 
-if [ $(uname) = Linux ]; then
-	trap "kill_stub; exit 1" SIGINT SIGTERM EXIT
-	start_stub "-s 2048 -i 0 -m 0xF"
-fi
-
 # Build against the version of SPDK under test
 rm -f "$spdk_nvme_cli/spdk"
 ln -sf "$rootdir" "$spdk_nvme_cli/spdk"
 
 cd $spdk_nvme_cli
 make clean && make -j$(nproc) LDFLAGS="$(make -s -C $spdk_nvme_cli/spdk ldflags)"
+
+trap "kill_stub; exit 1" SIGINT SIGTERM EXIT
+start_stub "-s 2048 -i 0 -m 0xF"
+
 sed -i 's/spdk=0/spdk=1/g' spdk.conf
 sed -i 's/shm_id=.*/shm_id=0/g' spdk.conf
 for bdf in $(get_nvme_bdfs); do
@@ -44,7 +48,6 @@ for bdf in $(get_nvme_bdfs); do
 	./nvme get-log $bdf -i 1 -l 100
 	./nvme reset $bdf
 done
-if [ $(uname) = Linux ]; then
-	trap - SIGINT SIGTERM EXIT
-	kill_stub
-fi
+
+trap - SIGINT SIGTERM EXIT
+kill_stub