ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: move blob library unit tests to test/unit

Browse Source 
Change-Id: I151672e49c442dc1420b5ef6b5a6a47eb78e7464
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/366517
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2017-06-21 14:31:29 -07:00 committed by Jim Harris
parent a4a8c40fe2
commit 728d001395
10 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = bdev blob blobfs env event iscsi json log nvme DIRS-y = bdev blobfs env event iscsi json log nvme
.PHONY: all clean $(DIRS-y) .PHONY: all clean $(DIRS-y)

2
test/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
View File

@ -41,7 +41,7 @@
#include "blobfs.c" #include "blobfs.c"
#include "tree.c" #include "tree.c"
#include "lib/blob/bs_dev_common.c" #include "unit/lib/blob/bs_dev_common.c"
struct spdk_filesystem *g_fs; struct spdk_filesystem *g_fs;
struct spdk_file *g_file; struct spdk_file *g_file;

2
test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
View File

@ -40,7 +40,7 @@
#include "spdk/barrier.h" #include "spdk/barrier.h"
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "lib/blob/bs_dev_common.c" #include "unit/lib/blob/bs_dev_common.c"
#include "lib/test_env.c" #include "lib/test_env.c"
#include "blobfs.c" #include "blobfs.c"
#include "tree.c" #include "tree.c"

2
test/unit/lib/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = bdev ioat json jsonrpc nvme nvmf scsi util DIRS-y = bdev blob ioat json jsonrpc nvme nvmf scsi util
.PHONY: all clean $(DIRS-y) .PHONY: all clean $(DIRS-y)

5
test/lib/blob/Makefile → test/unit/lib/blob/Makefile
View File

@ -31,10 +31,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
DIRS-y = blob_ut DIRS-y = blob.c
.PHONY: all clean $(DIRS-y) .PHONY: all clean $(DIRS-y)
all: $(DIRS-y) all: $(DIRS-y)

0
test/lib/blob/blob_ut/.gitignore → test/unit/lib/blob/blob.c/.gitignore vendored
View File

2
test/lib/blob/blob_ut/Makefile → test/unit/lib/blob/blob.c/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

0
test/lib/blob/blob_ut/blob_ut.c → test/unit/lib/blob/blob.c/blob_ut.c
View File

0
test/lib/blob/bs_dev_common.c → test/unit/lib/blob/bs_dev_common.c
View File

2
unittest.sh
View File

@ -32,7 +32,7 @@ fi
$valgrind test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut $valgrind test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut
$valgrind test/lib/blob/blob_ut/blob_ut $valgrind test/unit/lib/blob/blob.c/blob_ut
$valgrind test/lib/blobfs/blobfs_async_ut/blobfs_async_ut $valgrind test/lib/blobfs/blobfs_async_ut/blobfs_async_ut
# blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind # blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind