From 9b004663920e4636b0d21ed46796d273fb339544 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 18 Jan 2021 13:03:50 +0900 Subject: [PATCH] ut/bdev_ocssd: Move bdev_ocssd_ut from bdev directory to bdev/nvme directory Signed-off-by: Shuhei Matsumoto Change-Id: Ifa9aa75086264037ae72926b89c4f63c8123f2eb Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6129 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Paul Luse --- test/unit/lib/bdev/Makefile | 2 +- test/unit/lib/bdev/nvme/Makefile | 44 +++++++++++++++++++ .../bdev/{ => nvme}/bdev_ocssd.c/.gitignore | 0 .../lib/bdev/{ => nvme}/bdev_ocssd.c/Makefile | 2 +- .../{ => nvme}/bdev_ocssd.c/bdev_ocssd_ut.c | 0 test/unit/unittest.sh | 2 +- 6 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 test/unit/lib/bdev/nvme/Makefile rename test/unit/lib/bdev/{ => nvme}/bdev_ocssd.c/.gitignore (100%) rename test/unit/lib/bdev/{ => nvme}/bdev_ocssd.c/Makefile (96%) rename test/unit/lib/bdev/{ => nvme}/bdev_ocssd.c/bdev_ocssd_ut.c (100%) diff --git a/test/unit/lib/bdev/Makefile b/test/unit/lib/bdev/Makefile index 8120b1127..83f95f3b7 100644 --- a/test/unit/lib/bdev/Makefile +++ b/test/unit/lib/bdev/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev.c part.c scsi_nvme.c gpt vbdev_lvol.c mt raid bdev_zone.c vbdev_zone_block.c bdev_ocssd.c +DIRS-y = bdev.c part.c scsi_nvme.c gpt vbdev_lvol.c mt raid bdev_zone.c vbdev_zone_block.c nvme DIRS-$(CONFIG_CRYPTO) += crypto.c diff --git a/test/unit/lib/bdev/nvme/Makefile b/test/unit/lib/bdev/nvme/Makefile new file mode 100644 index 000000000..913b92083 --- /dev/null +++ b/test/unit/lib/bdev/nvme/Makefile @@ -0,0 +1,44 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = bdev_ocssd.c + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/test/unit/lib/bdev/bdev_ocssd.c/.gitignore b/test/unit/lib/bdev/nvme/bdev_ocssd.c/.gitignore similarity index 100% rename from test/unit/lib/bdev/bdev_ocssd.c/.gitignore rename to test/unit/lib/bdev/nvme/bdev_ocssd.c/.gitignore diff --git a/test/unit/lib/bdev/bdev_ocssd.c/Makefile b/test/unit/lib/bdev/nvme/bdev_ocssd.c/Makefile similarity index 96% rename from test/unit/lib/bdev/bdev_ocssd.c/Makefile rename to test/unit/lib/bdev/nvme/bdev_ocssd.c/Makefile index 7106d46fc..82046a8a8 100644 --- a/test/unit/lib/bdev/bdev_ocssd.c/Makefile +++ b/test/unit/lib/bdev/nvme/bdev_ocssd.c/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)/../../../../../..) TEST_FILE = bdev_ocssd_ut.c diff --git a/test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c b/test/unit/lib/bdev/nvme/bdev_ocssd.c/bdev_ocssd_ut.c similarity index 100% rename from test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c rename to test/unit/lib/bdev/nvme/bdev_ocssd.c/bdev_ocssd_ut.c diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh index 91b249cf1..75f13215d 100755 --- a/test/unit/unittest.sh +++ b/test/unit/unittest.sh @@ -14,7 +14,7 @@ cd "$rootdir" function unittest_bdev() { $valgrind $testdir/lib/bdev/bdev.c/bdev_ut - $valgrind $testdir/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut + $valgrind $testdir/lib/bdev/nvme/bdev_ocssd.c/bdev_ocssd_ut $valgrind $testdir/lib/bdev/raid/bdev_raid.c/bdev_raid_ut $valgrind $testdir/lib/bdev/bdev_zone.c/bdev_zone_ut $valgrind $testdir/lib/bdev/gpt/gpt.c/gpt_ut