From 058be487c3978f59f17bc41e0adbd0955814df00 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 18 Jun 2020 05:45:19 -0400 Subject: [PATCH] test/ftl: point to absolute path to setup.sh $rootdir is used already in this script, but couple instances were left out. We should always point to $rootdir or $testdir when refering to scripts and test files. Signed-off-by: Tomasz Zawadzki Change-Id: Ifeb4527c6fd42881a6e04c1406a765f57498ae7d Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2937 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Maciej Wawryk Reviewed-by: Karol Latecki --- test/ftl/ftl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ftl/ftl.sh b/test/ftl/ftl.sh index e0c08bbeb..b432bdfb0 100755 --- a/test/ftl/ftl.sh +++ b/test/ftl/ftl.sh @@ -9,7 +9,7 @@ rpc_py=$rootdir/scripts/rpc.py function at_ftl_exit() { # restore original driver - PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="$ocssd_original_dirver" ./scripts/setup.sh + PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="$ocssd_original_dirver" $rootdir/scripts/setup.sh } read -r device _ <<< "$OCSSD_PCI_DEVICES" @@ -27,7 +27,7 @@ ocssd_original_dirver="$(basename $(readlink /sys/bus/pci/devices/$device/driver trap 'at_ftl_exit' SIGINT SIGTERM EXIT # OCSSD is blacklisted so bind it to vfio/uio driver before testing -PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="" ./scripts/setup.sh +PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="" $rootdir/scripts/setup.sh # Use first regular NVMe disk (non-OC) as non-volatile cache nvme_disks=$($rootdir/scripts/gen_nvme.sh --json | jq -r \