Commit 86af2ae5 authored by Jim Harris's avatar Jim Harris
Browse files

test/bdev: do not hardcode sgdisk directory 



At least on Ubuntu, sgdisk gets installed to /sbin, not /usr/sbin.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I59c806d2c93c6a1773aea11d6fc669e3df0e3c08

Reviewed-on: https://review.gerrithub.io/369304


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 15337ade

test/lib/bdev/blockdev.sh

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ timing_enter bounds 
$testdir/bdevio/bdevio $testdir/bdev.conf

timing_exit bounds



if [ $(uname -s) = Linux ] && [ -f /usr/sbin/sgdisk ]; then

if [ $(uname -s) = Linux ] && hash sgdisk; then

	echo "[Rpc]" >> $testdir/bdev.conf

	echo "  Enable Yes" >> $testdir/bdev.conf
@@ -33,8 +33,8 @@ if [ $(uname -s) = Linux ] && [ -f /usr/sbin/sgdisk ]; then 
		if [ -e /dev/nbd0 ]; then

			parted -s /dev/nbd0 mklabel gpt mkpart first '0%' '50%' mkpart second '50%' '100%'

			# change the partition type GUID to SPDK GUID value

			/usr/sbin/sgdisk -t 1:$SPDK_GPT_GUID /dev/nbd0

			/usr/sbin/sgdisk -t 2:$SPDK_GPT_GUID /dev/nbd0

			sgdisk -t 1:$SPDK_GPT_GUID /dev/nbd0

			sgdisk -t 2:$SPDK_GPT_GUID /dev/nbd0

		fi

		killprocess $nbd_pid