From e956dde2dbded174f3ccee2f5356b5c5630eeb04 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 13 Feb 2018 10:01:21 -0700 Subject: [PATCH] test/bdev: move nbd_common.sh to main bdev test director This allows us to remove the test/lib/bdev/nbd directory. Signed-off-by: Jim Harris Change-Id: I3941b68c9c36a0e934acf2a0570e69c4d9dba722 Reviewed-on: https://review.gerrithub.io/399762 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp --- test/lib/bdev/blockdev.sh | 2 +- test/lib/bdev/nbd/.gitignore | 1 - test/lib/bdev/{nbd => }/nbd_common.sh | 0 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 test/lib/bdev/nbd/.gitignore rename test/lib/bdev/{nbd => }/nbd_common.sh (100%) diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh index 09fda353db..8174f342ed 100755 --- a/test/lib/bdev/blockdev.sh +++ b/test/lib/bdev/blockdev.sh @@ -18,7 +18,7 @@ function run_fio() } source $rootdir/scripts/autotest_common.sh -source $testdir/nbd/nbd_common.sh +source $testdir/nbd_common.sh function nbd_function_test() { if [ $(uname -s) = Linux ] && modprobe -n nbd; then diff --git a/test/lib/bdev/nbd/.gitignore b/test/lib/bdev/nbd/.gitignore deleted file mode 100644 index cb3ca605f1..0000000000 --- a/test/lib/bdev/nbd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -nbd diff --git a/test/lib/bdev/nbd/nbd_common.sh b/test/lib/bdev/nbd_common.sh similarity index 100% rename from test/lib/bdev/nbd/nbd_common.sh rename to test/lib/bdev/nbd_common.sh