From 11495b5c63ae43a25ddd238dba873f9181613684 Mon Sep 17 00:00:00 2001 From: Artur Paszkiewicz Date: Mon, 3 Feb 2020 12:33:41 +0100 Subject: [PATCH] ut/raid: put bdev_raid.c into 'raid' subdirectory To make room for other raid module unit tests. Change-Id: Icf8b8ff0c9051ccb4c7ebd784807370f8be1a8fb Signed-off-by: Artur Paszkiewicz Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/853 Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- test/unit/lib/bdev/Makefile | 2 +- test/unit/lib/bdev/raid/Makefile | 44 +++++++++++++++++++ .../bdev/{ => raid}/bdev_raid.c/.gitignore | 0 .../lib/bdev/{ => raid}/bdev_raid.c/Makefile | 2 +- .../{ => raid}/bdev_raid.c/bdev_raid_ut.c | 0 test/unit/unittest.sh | 2 +- 6 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 test/unit/lib/bdev/raid/Makefile rename test/unit/lib/bdev/{ => raid}/bdev_raid.c/.gitignore (100%) rename test/unit/lib/bdev/{ => raid}/bdev_raid.c/Makefile (96%) rename test/unit/lib/bdev/{ => raid}/bdev_raid.c/bdev_raid_ut.c (100%) diff --git a/test/unit/lib/bdev/Makefile b/test/unit/lib/bdev/Makefile index 4c6eadfb0..8120b1127 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 bdev_raid.c 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 bdev_ocssd.c DIRS-$(CONFIG_CRYPTO) += crypto.c diff --git a/test/unit/lib/bdev/raid/Makefile b/test/unit/lib/bdev/raid/Makefile new file mode 100644 index 000000000..e20f4a82f --- /dev/null +++ b/test/unit/lib/bdev/raid/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_raid.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_raid.c/.gitignore b/test/unit/lib/bdev/raid/bdev_raid.c/.gitignore similarity index 100% rename from test/unit/lib/bdev/bdev_raid.c/.gitignore rename to test/unit/lib/bdev/raid/bdev_raid.c/.gitignore diff --git a/test/unit/lib/bdev/bdev_raid.c/Makefile b/test/unit/lib/bdev/raid/bdev_raid.c/Makefile similarity index 96% rename from test/unit/lib/bdev/bdev_raid.c/Makefile rename to test/unit/lib/bdev/raid/bdev_raid.c/Makefile index 8bfb1856e..da0ab94ba 100644 --- a/test/unit/lib/bdev/bdev_raid.c/Makefile +++ b/test/unit/lib/bdev/raid/bdev_raid.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_raid_ut.c diff --git a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c similarity index 100% rename from test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c rename to test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh index e027d6986..20a98f37b 100755 --- a/test/unit/unittest.sh +++ b/test/unit/unittest.sh @@ -15,7 +15,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/bdev_raid.c/bdev_raid_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 $valgrind $testdir/lib/bdev/part.c/part_ut