From 928df4a44856a749900867efd13615626b5d76fe Mon Sep 17 00:00:00 2001 From: Jing Xia Date: Wed, 3 May 2017 21:54:47 +0800 Subject: [PATCH] test/blobfs: Rename blobfs test file name Change-Id: I584c667aff5a0cdfee26b958a2b58c6ed41d45f7 Signed-off-by: Jing Xia --- test/lib/blobfs/Makefile | 2 +- test/lib/blobfs/blobfs_async_ut/.gitignore | 1 + test/lib/blobfs/{blobfs_ut => blobfs_async_ut}/Makefile | 4 ++-- .../blobfs_ut.c => blobfs_async_ut/blobfs_async_ut.c} | 2 +- test/lib/blobfs/blobfs_sync_ut/.gitignore | 1 + test/lib/blobfs/{cache_ut => blobfs_sync_ut}/Makefile | 4 ++-- .../cache_ut.c => blobfs_sync_ut/blobfs_sync_ut.c} | 2 +- test/lib/blobfs/blobfs_ut/.gitignore | 1 - test/lib/blobfs/cache_ut/.gitignore | 1 - unittest.sh | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 test/lib/blobfs/blobfs_async_ut/.gitignore rename test/lib/blobfs/{blobfs_ut => blobfs_async_ut}/Makefile (97%) rename test/lib/blobfs/{blobfs_ut/blobfs_ut.c => blobfs_async_ut/blobfs_async_ut.c} (99%) create mode 100644 test/lib/blobfs/blobfs_sync_ut/.gitignore rename test/lib/blobfs/{cache_ut => blobfs_sync_ut}/Makefile (97%) rename test/lib/blobfs/{cache_ut/cache_ut.c => blobfs_sync_ut/blobfs_sync_ut.c} (99%) delete mode 100644 test/lib/blobfs/blobfs_ut/.gitignore delete mode 100644 test/lib/blobfs/cache_ut/.gitignore diff --git a/test/lib/blobfs/Makefile b/test/lib/blobfs/Makefile index bd801aa2bb..c0a1ed9a31 100644 --- a/test/lib/blobfs/Makefile +++ b/test/lib/blobfs/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = blobfs_ut cache_ut mkfs +DIRS-y = blobfs_async_ut blobfs_sync_ut mkfs # TODO: do not check a hardcoded path here ifneq (,$(wildcard /usr/local/include/fuse3)) diff --git a/test/lib/blobfs/blobfs_async_ut/.gitignore b/test/lib/blobfs/blobfs_async_ut/.gitignore new file mode 100644 index 0000000000..aea3b021d7 --- /dev/null +++ b/test/lib/blobfs/blobfs_async_ut/.gitignore @@ -0,0 +1 @@ +blobfs_async_ut diff --git a/test/lib/blobfs/blobfs_ut/Makefile b/test/lib/blobfs/blobfs_async_ut/Makefile similarity index 97% rename from test/lib/blobfs/blobfs_ut/Makefile rename to test/lib/blobfs/blobfs_async_ut/Makefile index 8b265d553f..934b907ada 100644 --- a/test/lib/blobfs/blobfs_ut/Makefile +++ b/test/lib/blobfs/blobfs_async_ut/Makefile @@ -35,9 +35,9 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk -APP = blobfs_ut +APP = blobfs_async_ut -C_SRCS := blobfs_ut.c +C_SRCS := blobfs_async_ut.c CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blobfs -I$(SPDK_ROOT_DIR)/lib/blob CFLAGS += -I$(SPDK_ROOT_DIR)/test diff --git a/test/lib/blobfs/blobfs_ut/blobfs_ut.c b/test/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c similarity index 99% rename from test/lib/blobfs/blobfs_ut/blobfs_ut.c rename to test/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c index 03e07c1b0f..1d03b503c8 100644 --- a/test/lib/blobfs/blobfs_ut/blobfs_ut.c +++ b/test/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c @@ -428,7 +428,7 @@ int main(int argc, char **argv) return CU_get_error(); } - suite = CU_add_suite("blobfs", NULL, NULL); + suite = CU_add_suite("blobfs_async_ut", NULL, NULL); if (suite == NULL) { CU_cleanup_registry(); return CU_get_error(); diff --git a/test/lib/blobfs/blobfs_sync_ut/.gitignore b/test/lib/blobfs/blobfs_sync_ut/.gitignore new file mode 100644 index 0000000000..93ef643ff6 --- /dev/null +++ b/test/lib/blobfs/blobfs_sync_ut/.gitignore @@ -0,0 +1 @@ +blobfs_sync_ut diff --git a/test/lib/blobfs/cache_ut/Makefile b/test/lib/blobfs/blobfs_sync_ut/Makefile similarity index 97% rename from test/lib/blobfs/cache_ut/Makefile rename to test/lib/blobfs/blobfs_sync_ut/Makefile index 7dab97add4..23442706f8 100644 --- a/test/lib/blobfs/cache_ut/Makefile +++ b/test/lib/blobfs/blobfs_sync_ut/Makefile @@ -35,9 +35,9 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk -APP = cache_ut +APP = blobfs_sync_ut -C_SRCS := cache_ut.c +C_SRCS := blobfs_sync_ut.c CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blobfs -I$(SPDK_ROOT_DIR)/lib/blob CFLAGS += -I$(SPDK_ROOT_DIR)/test diff --git a/test/lib/blobfs/cache_ut/cache_ut.c b/test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c similarity index 99% rename from test/lib/blobfs/cache_ut/cache_ut.c rename to test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c index 09a4749c1a..a361c17d2a 100644 --- a/test/lib/blobfs/cache_ut/cache_ut.c +++ b/test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c @@ -278,7 +278,7 @@ int main(int argc, char **argv) return CU_get_error(); } - suite = CU_add_suite("cache_ut", NULL, NULL); + suite = CU_add_suite("blobfs_sync_ut", NULL, NULL); if (suite == NULL) { CU_cleanup_registry(); return CU_get_error(); diff --git a/test/lib/blobfs/blobfs_ut/.gitignore b/test/lib/blobfs/blobfs_ut/.gitignore deleted file mode 100644 index 4a7e1261e3..0000000000 --- a/test/lib/blobfs/blobfs_ut/.gitignore +++ /dev/null @@ -1 +0,0 @@ -blobfs_ut diff --git a/test/lib/blobfs/cache_ut/.gitignore b/test/lib/blobfs/cache_ut/.gitignore deleted file mode 100644 index 32d6e308d3..0000000000 --- a/test/lib/blobfs/cache_ut/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cache_ut diff --git a/unittest.sh b/unittest.sh index aa3428b4d6..81b27227b1 100755 --- a/unittest.sh +++ b/unittest.sh @@ -7,9 +7,9 @@ set -xe $valgrind test/lib/blob/blob_ut/blob_ut -$valgrind test/lib/blobfs/blobfs_ut/blobfs_ut -# cache_ut hangs when run under valgrind, so don't use $valgrind -test/lib/blobfs/cache_ut/cache_ut +$valgrind test/lib/blobfs/blobfs_async_ut/blobfs_async_ut +# blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind +test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut $valgrind test/lib/nvme/unit/nvme_c/nvme_ut $valgrind test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut