Commit af761ab1 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

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: default avatarTomasz 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent d76951c7

test/nvme/spdk_nvme_cli.sh

+12 −9
Original line number Diff line number Diff line
@@ -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