From 435990003e206376cb87ac162a50942877aa267c Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 13 Feb 2018 08:12:23 -0700 Subject: [PATCH] build: make nvme.unittest.mk the common unittest .mk include This is the first of a long line of patches which will reduce Makefile rule duplication in all of our SPDK unit tests. Signed-off-by: Jim Harris Change-Id: I1cd6e9e1e9cabab0a15dbcb901e4db782d73b1a4 Reviewed-on: https://review.gerrithub.io/399716 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp --- mk/{nvme.unittest.mk => spdk.unittest.mk} | 0 test/unit/lib/nvme/nvme.c/Makefile | 2 +- test/unit/lib/nvme/nvme_ctrlr.c/Makefile | 2 +- test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile | 2 +- test/unit/lib/nvme/nvme_ns.c/Makefile | 2 +- test/unit/lib/nvme/nvme_ns_cmd.c/Makefile | 2 +- test/unit/lib/nvme/nvme_pcie.c/Makefile | 2 +- test/unit/lib/nvme/nvme_qpair.c/Makefile | 2 +- test/unit/lib/nvme/nvme_quirks.c/Makefile | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename mk/{nvme.unittest.mk => spdk.unittest.mk} (100%) diff --git a/mk/nvme.unittest.mk b/mk/spdk.unittest.mk similarity index 100% rename from mk/nvme.unittest.mk rename to mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme.c/Makefile b/test/unit/lib/nvme/nvme.c/Makefile index 34e14ef02..4202cf54c 100644 --- a/test/unit/lib/nvme/nvme.c/Makefile +++ b/test/unit/lib/nvme/nvme.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile index eac386ddf..3ce33dc4e 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile +++ b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ctrlr_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile index b219358ed..5c647dd31 100644 --- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile +++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ctrlr_cmd_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_ns.c/Makefile b/test/unit/lib/nvme/nvme_ns.c/Makefile index 7eac69986..add85ee9f 100644 --- a/test/unit/lib/nvme/nvme_ns.c/Makefile +++ b/test/unit/lib/nvme/nvme_ns.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ns_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile index fa2ead2ba..ff451d72a 100644 --- a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile +++ b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ns_cmd_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_pcie.c/Makefile b/test/unit/lib/nvme/nvme_pcie.c/Makefile index 117d03640..09032a935 100644 --- a/test/unit/lib/nvme/nvme_pcie.c/Makefile +++ b/test/unit/lib/nvme/nvme_pcie.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_pcie_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_qpair.c/Makefile b/test/unit/lib/nvme/nvme_qpair.c/Makefile index 225b94048..d7762a384 100644 --- a/test/unit/lib/nvme/nvme_qpair.c/Makefile +++ b/test/unit/lib/nvme/nvme_qpair.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_qpair_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/unit/lib/nvme/nvme_quirks.c/Makefile b/test/unit/lib/nvme/nvme_quirks.c/Makefile index 396f8a853..d86887f0e 100644 --- a/test/unit/lib/nvme/nvme_quirks.c/Makefile +++ b/test/unit/lib/nvme/nvme_quirks.c/Makefile @@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_quirks_ut.c -include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk +include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk