From 656c4a7abe695058b44cce096552871c3e1fcc04 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 22 Mar 2018 14:30:57 -0700 Subject: [PATCH] test: move test/lib/blobfs under test/blobfs Change-Id: Icaac9df0623148e6c785d2b1a560b165a1a03408 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/404966 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp --- doc/blobfs.md | 4 ++-- test/Makefile | 2 +- test/{lib => }/blobfs/Makefile | 2 +- test/{lib => }/blobfs/fuse/.gitignore | 0 test/{lib => }/blobfs/fuse/Makefile | 2 +- test/{lib => }/blobfs/fuse/fuse.c | 0 test/{lib => }/blobfs/mkfs/.gitignore | 0 test/{lib => }/blobfs/mkfs/Makefile | 2 +- test/{lib => }/blobfs/mkfs/mkfs.c | 0 test/blobfs/rocksdb/rocksdb.sh | 3 +-- test/{lib => }/blobfs/test_plan.md | 0 test/lib/Makefile | 2 +- 12 files changed, 8 insertions(+), 9 deletions(-) rename test/{lib => }/blobfs/Makefile (97%) rename test/{lib => }/blobfs/fuse/.gitignore (100%) rename test/{lib => }/blobfs/fuse/Makefile (97%) rename test/{lib => }/blobfs/fuse/fuse.c (100%) rename test/{lib => }/blobfs/mkfs/.gitignore (100%) rename test/{lib => }/blobfs/mkfs/Makefile (97%) rename test/{lib => }/blobfs/mkfs/mkfs.c (100%) rename test/{lib => }/blobfs/test_plan.md (100%) diff --git a/doc/blobfs.md b/doc/blobfs.md index e0ad29fe7..eee88548c 100644 --- a/doc/blobfs.md +++ b/doc/blobfs.md @@ -56,7 +56,7 @@ HUGEMEM=5120 scripts/setup.sh Create an empty SPDK blobfs for testing. ~~~{.sh} -test/lib/blobfs/mkfs/mkfs /usr/local/etc/spdk/rocksdb.conf Nvme0n1 +test/blobfs/mkfs/mkfs /usr/local/etc/spdk/rocksdb.conf Nvme0n1 ~~~ At this point, RocksDB is ready for testing with SPDK. Three `db_bench` parameters are used to configure SPDK: @@ -76,7 +76,7 @@ BlobFS provides a FUSE plug-in to mount an SPDK BlobFS as a kernel filesystem fo The FUSE plug-in requires fuse3 and will be built automatically when fuse3 is detected on the system. ~~~{.sh} -test/lib/blobfs/fuse/fuse /usr/local/etc/spdk/rocksdb.conf Nvme0n1 /mnt/fuse +test/blobfs/fuse/fuse /usr/local/etc/spdk/rocksdb.conf Nvme0n1 /mnt/fuse ~~~ Note that the FUSE plug-in has some limitations - see the list below. diff --git a/test/Makefile b/test/Makefile index 031ddf043..e4b308359 100644 --- a/test/Makefile +++ b/test/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk # These directories contain tests. -TESTDIRS = app bdev cpp_headers lib unit +TESTDIRS = app bdev blobfs cpp_headers lib unit DIRS-y = $(TESTDIRS) diff --git a/test/lib/blobfs/Makefile b/test/blobfs/Makefile similarity index 97% rename from test/lib/blobfs/Makefile rename to test/blobfs/Makefile index 08953a386..1a9dfefac 100644 --- a/test/lib/blobfs/Makefile +++ b/test/blobfs/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = mkfs diff --git a/test/lib/blobfs/fuse/.gitignore b/test/blobfs/fuse/.gitignore similarity index 100% rename from test/lib/blobfs/fuse/.gitignore rename to test/blobfs/fuse/.gitignore diff --git a/test/lib/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile similarity index 97% rename from test/lib/blobfs/fuse/Makefile rename to test/blobfs/fuse/Makefile index 80e6110d1..56a19de00 100644 --- a/test/lib/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk diff --git a/test/lib/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c similarity index 100% rename from test/lib/blobfs/fuse/fuse.c rename to test/blobfs/fuse/fuse.c diff --git a/test/lib/blobfs/mkfs/.gitignore b/test/blobfs/mkfs/.gitignore similarity index 100% rename from test/lib/blobfs/mkfs/.gitignore rename to test/blobfs/mkfs/.gitignore diff --git a/test/lib/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile similarity index 97% rename from test/lib/blobfs/mkfs/Makefile rename to test/blobfs/mkfs/Makefile index bdf3672ea..54f860ad1 100644 --- a/test/lib/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk diff --git a/test/lib/blobfs/mkfs/mkfs.c b/test/blobfs/mkfs/mkfs.c similarity index 100% rename from test/lib/blobfs/mkfs/mkfs.c rename to test/blobfs/mkfs/mkfs.c diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 0a08c7e11..87425211c 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -47,7 +47,7 @@ $rootdir/scripts/gen_nvme.sh >> $ROCKSDB_CONF trap 'rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT timing_enter mkfs -$rootdir/test/lib/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1 +$rootdir/test/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1 timing_exit mkfs mkdir $output_dir/rocksdb @@ -62,7 +62,6 @@ else fi cd $RESULTS_DIR - cp $testdir/common_flags.txt insert_flags.txt echo "--benchmarks=fillseq" >> insert_flags.txt echo "--threads=1" >> insert_flags.txt diff --git a/test/lib/blobfs/test_plan.md b/test/blobfs/test_plan.md similarity index 100% rename from test/lib/blobfs/test_plan.md rename to test/blobfs/test_plan.md diff --git a/test/lib/Makefile b/test/lib/Makefile index ad6fa4611..aac3a0d66 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = blobfs env event json nvme util +DIRS-y = env event json nvme util .PHONY: all clean $(DIRS-y)