From cd34605b6fea780edc9b223214fc2a5d039d539a Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Fri, 2 Mar 2018 14:17:03 -0700
Subject: [PATCH] test/nvme-cli: build against current SPDK revision

Rather than building against some local version of SPDK from the
nvme-cli checkout, build against the SPDK version that autotest is
currently testing.

Change-Id: Ifbb1dde1ace9247929f499e31ab6401503ec18d2
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/402378
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/lib/nvme/spdk_nvme_cli.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/lib/nvme/spdk_nvme_cli.sh b/test/lib/nvme/spdk_nvme_cli.sh
index 17031149d..eb8bdc6b2 100755
--- a/test/lib/nvme/spdk_nvme_cli.sh
+++ b/test/lib/nvme/spdk_nvme_cli.sh
@@ -16,6 +16,10 @@ if [ `uname` = Linux ]; then
 fi
 
 if [ -d $spdk_nvme_cli ]; then
+	# Build against the version of SPDK under test
+	rm -f "$spdk_nvme_cli/spdk"
+	ln -sf "$rootdir" "$spdk_nvme_cli/spdk"
+
 	bdfs=$(iter_pci_class_code 01 08 02)
 	bdf=$(echo $bdfs|awk '{ print $1 }')
 	cd $spdk_nvme_cli