From 9c2aea2ad581e78982146835ecab3b12107d25d6 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 21 Nov 2018 01:34:15 -0700 Subject: [PATCH] build: remove duplicate spdk.app.mk includes spdk.unittest.mk includes spdk.app.mk, but some unit test Makefiles include both spdk.unittest.mk and spdk.app.mk, meaning spdk.app.mk gets included twice. Fix that. This hasn't been an issue because spdk.app.mk currently only includes variables - but no rules. Signed-off-by: Jim Harris Change-Id: I23d39e8084f79442fb06ae9b5a6a68d6134adff4 Reviewed-on: https://review.gerrithub.io/434281 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- test/env/memory/Makefile | 1 - test/env/pci/Makefile | 1 - test/env/vtophys/Makefile | 1 - test/unit/include/spdk/histogram_data.h/Makefile | 1 - test/unit/lib/bdev/bdev.c/Makefile | 1 - test/unit/lib/bdev/bdev_raid.c/Makefile | 1 - test/unit/lib/bdev/crypto.c/Makefile | 1 - test/unit/lib/bdev/gpt/gpt.c/Makefile | 1 - test/unit/lib/bdev/mt/bdev.c/Makefile | 1 - test/unit/lib/bdev/part.c/Makefile | 1 - test/unit/lib/bdev/pmem/Makefile | 1 - test/unit/lib/bdev/scsi_nvme.c/Makefile | 1 - test/unit/lib/bdev/vbdev_lvol.c/Makefile | 1 - test/unit/lib/blob/blob.c/Makefile | 1 - test/unit/lib/blobfs/blobfs_async_ut/Makefile | 1 - test/unit/lib/blobfs/blobfs_sync_ut/Makefile | 1 - test/unit/lib/blobfs/tree.c/Makefile | 1 - test/unit/lib/event/app.c/Makefile | 1 - test/unit/lib/event/subsystem.c/Makefile | 1 - test/unit/lib/iscsi/conn.c/Makefile | 1 - test/unit/lib/iscsi/init_grp.c/Makefile | 1 - test/unit/lib/iscsi/iscsi.c/Makefile | 1 - test/unit/lib/iscsi/param.c/Makefile | 1 - test/unit/lib/iscsi/portal_grp.c/Makefile | 1 - test/unit/lib/iscsi/tgt_node.c/Makefile | 1 - test/unit/lib/log/log.c/Makefile | 1 - test/unit/lib/lvol/lvol.c/Makefile | 1 - test/unit/lib/reduce/reduce.c/Makefile | 1 - test/unit/lib/scsi/dev.c/Makefile | 1 - test/unit/lib/scsi/lun.c/Makefile | 1 - test/unit/lib/scsi/scsi.c/Makefile | 1 - test/unit/lib/scsi/scsi_bdev.c/Makefile | 1 - test/unit/lib/sock/sock.c/Makefile | 1 - test/unit/lib/thread/thread.c/Makefile | 1 - test/unit/lib/util/base64.c/Makefile | 1 - test/unit/lib/util/bit_array.c/Makefile | 1 - test/unit/lib/util/cpuset.c/Makefile | 1 - test/unit/lib/util/crc16.c/Makefile | 1 - test/unit/lib/util/crc32_ieee.c/Makefile | 1 - test/unit/lib/util/crc32c.c/Makefile | 1 - test/unit/lib/util/string.c/Makefile | 1 - test/unit/lib/vhost/vhost.c/Makefile | 1 - 42 files changed, 42 deletions(-) diff --git a/test/env/memory/Makefile b/test/env/memory/Makefile index 1a9b208df..b5b69690c 100644 --- a/test/env/memory/Makefile +++ b/test/env/memory/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test/lib diff --git a/test/env/pci/Makefile b/test/env/pci/Makefile index a0a371b8b..5e2cc8964 100644 --- a/test/env/pci/Makefile +++ b/test/env/pci/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk UNIT_TEST_LINK_ENV = 1 CFLAGS += $(ENV_CFLAGS) diff --git a/test/env/vtophys/Makefile b/test/env/vtophys/Makefile index 076fd2691..c4a2db7fe 100644 --- a/test/env/vtophys/Makefile +++ b/test/env/vtophys/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk UNIT_TEST_LINK_ENV = 1 TEST_FILE = vtophys.c diff --git a/test/unit/include/spdk/histogram_data.h/Makefile b/test/unit/include/spdk/histogram_data.h/Makefile index 08d4f052e..23b919d05 100644 --- a/test/unit/include/spdk/histogram_data.h/Makefile +++ b/test/unit/include/spdk/histogram_data.h/Makefile @@ -32,7 +32,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = histogram_ut.c diff --git a/test/unit/lib/bdev/bdev.c/Makefile b/test/unit/lib/bdev/bdev.c/Makefile index 384fa27ae..9058ebee9 100644 --- a/test/unit/lib/bdev/bdev.c/Makefile +++ b/test/unit/lib/bdev/bdev.c/Makefile @@ -32,7 +32,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = bdev_ut.c diff --git a/test/unit/lib/bdev/bdev_raid.c/Makefile b/test/unit/lib/bdev/bdev_raid.c/Makefile index 9739cb44c..ee7f1e99f 100644 --- a/test/unit/lib/bdev/bdev_raid.c/Makefile +++ b/test/unit/lib/bdev/bdev_raid.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = bdev_raid_ut.c diff --git a/test/unit/lib/bdev/crypto.c/Makefile b/test/unit/lib/bdev/crypto.c/Makefile index 3241464be..34eb6ab91 100644 --- a/test/unit/lib/bdev/crypto.c/Makefile +++ b/test/unit/lib/bdev/crypto.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = crypto_ut.c CFLAGS += $(ENV_CFLAGS) diff --git a/test/unit/lib/bdev/gpt/gpt.c/Makefile b/test/unit/lib/bdev/gpt/gpt.c/Makefile index ad21ea2ad..ee9832212 100644 --- a/test/unit/lib/bdev/gpt/gpt.c/Makefile +++ b/test/unit/lib/bdev/gpt/gpt.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = gpt_ut.c diff --git a/test/unit/lib/bdev/mt/bdev.c/Makefile b/test/unit/lib/bdev/mt/bdev.c/Makefile index 96b485742..cddc77504 100644 --- a/test/unit/lib/bdev/mt/bdev.c/Makefile +++ b/test/unit/lib/bdev/mt/bdev.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk TEST_FILE = bdev_ut.c diff --git a/test/unit/lib/bdev/part.c/Makefile b/test/unit/lib/bdev/part.c/Makefile index 9073c5cde..ce03d1a39 100644 --- a/test/unit/lib/bdev/part.c/Makefile +++ b/test/unit/lib/bdev/part.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = part_ut.c diff --git a/test/unit/lib/bdev/pmem/Makefile b/test/unit/lib/bdev/pmem/Makefile index 9c0e7dc1e..2114811de 100644 --- a/test/unit/lib/bdev/pmem/Makefile +++ b/test/unit/lib/bdev/pmem/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = bdev_pmem_ut.c diff --git a/test/unit/lib/bdev/scsi_nvme.c/Makefile b/test/unit/lib/bdev/scsi_nvme.c/Makefile index 0c9081483..015152f4b 100644 --- a/test/unit/lib/bdev/scsi_nvme.c/Makefile +++ b/test/unit/lib/bdev/scsi_nvme.c/Makefile @@ -32,7 +32,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = scsi_nvme_ut.c diff --git a/test/unit/lib/bdev/vbdev_lvol.c/Makefile b/test/unit/lib/bdev/vbdev_lvol.c/Makefile index c2e6b99e3..0a8642ef8 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/Makefile +++ b/test/unit/lib/bdev/vbdev_lvol.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../../) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = vbdev_lvol_ut.c diff --git a/test/unit/lib/blob/blob.c/Makefile b/test/unit/lib/blob/blob.c/Makefile index 6e279ff0e..4c07357fc 100644 --- a/test/unit/lib/blob/blob.c/Makefile +++ b/test/unit/lib/blob/blob.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk TEST_FILE = blob_ut.c diff --git a/test/unit/lib/blobfs/blobfs_async_ut/Makefile b/test/unit/lib/blobfs/blobfs_async_ut/Makefile index e6dd0ce2b..faf60154b 100644 --- a/test/unit/lib/blobfs/blobfs_async_ut/Makefile +++ b/test/unit/lib/blobfs/blobfs_async_ut/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = blob TEST_FILE = blobfs_async_ut.c diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/Makefile b/test/unit/lib/blobfs/blobfs_sync_ut/Makefile index 28f38421b..fb15cd8ff 100644 --- a/test/unit/lib/blobfs/blobfs_sync_ut/Makefile +++ b/test/unit/lib/blobfs/blobfs_sync_ut/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = blob TEST_FILE = blobfs_sync_ut.c diff --git a/test/unit/lib/blobfs/tree.c/Makefile b/test/unit/lib/blobfs/tree.c/Makefile index 64bc202a7..f1335f4d8 100644 --- a/test/unit/lib/blobfs/tree.c/Makefile +++ b/test/unit/lib/blobfs/tree.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = tree_ut.c diff --git a/test/unit/lib/event/app.c/Makefile b/test/unit/lib/event/app.c/Makefile index cce3ad864..791787bae 100644 --- a/test/unit/lib/event/app.c/Makefile +++ b/test/unit/lib/event/app.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk SPDK_LIB_LIST = conf trace jsonrpc json diff --git a/test/unit/lib/event/subsystem.c/Makefile b/test/unit/lib/event/subsystem.c/Makefile index ef76f4fe0..558a68a87 100644 --- a/test/unit/lib/event/subsystem.c/Makefile +++ b/test/unit/lib/event/subsystem.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = subsystem_ut.c diff --git a/test/unit/lib/iscsi/conn.c/Makefile b/test/unit/lib/iscsi/conn.c/Makefile index 96f2f5d79..8755ee472 100644 --- a/test/unit/lib/iscsi/conn.c/Makefile +++ b/test/unit/lib/iscsi/conn.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = trace diff --git a/test/unit/lib/iscsi/init_grp.c/Makefile b/test/unit/lib/iscsi/init_grp.c/Makefile index 9c87ef55b..4759c604d 100644 --- a/test/unit/lib/iscsi/init_grp.c/Makefile +++ b/test/unit/lib/iscsi/init_grp.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = conf TEST_FILE = init_grp_ut.c diff --git a/test/unit/lib/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile index 844cc84d4..d9470eda3 100644 --- a/test/unit/lib/iscsi/iscsi.c/Makefile +++ b/test/unit/lib/iscsi/iscsi.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = trace conf util diff --git a/test/unit/lib/iscsi/param.c/Makefile b/test/unit/lib/iscsi/param.c/Makefile index bc944ae99..ed8eb9c50 100644 --- a/test/unit/lib/iscsi/param.c/Makefile +++ b/test/unit/lib/iscsi/param.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = param_ut.c diff --git a/test/unit/lib/iscsi/portal_grp.c/Makefile b/test/unit/lib/iscsi/portal_grp.c/Makefile index ab28cabbe..9be5d8519 100644 --- a/test/unit/lib/iscsi/portal_grp.c/Makefile +++ b/test/unit/lib/iscsi/portal_grp.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = conf diff --git a/test/unit/lib/iscsi/tgt_node.c/Makefile b/test/unit/lib/iscsi/tgt_node.c/Makefile index 8cdf3ef3d..d7fbbf079 100644 --- a/test/unit/lib/iscsi/tgt_node.c/Makefile +++ b/test/unit/lib/iscsi/tgt_node.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = conf TEST_FILE = tgt_node_ut.c diff --git a/test/unit/lib/log/log.c/Makefile b/test/unit/lib/log/log.c/Makefile index deedd9fbf..ae6a381dd 100644 --- a/test/unit/lib/log/log.c/Makefile +++ b/test/unit/lib/log/log.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = log_ut.c diff --git a/test/unit/lib/lvol/lvol.c/Makefile b/test/unit/lib/lvol/lvol.c/Makefile index 917f4ef60..7c23ee56c 100644 --- a/test/unit/lib/lvol/lvol.c/Makefile +++ b/test/unit/lib/lvol/lvol.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = lvol_ut.c diff --git a/test/unit/lib/reduce/reduce.c/Makefile b/test/unit/lib/reduce/reduce.c/Makefile index a9c5d5a3c..7bd2fcc1c 100644 --- a/test/unit/lib/reduce/reduce.c/Makefile +++ b/test/unit/lib/reduce/reduce.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk TEST_FILE = reduce_ut.c diff --git a/test/unit/lib/scsi/dev.c/Makefile b/test/unit/lib/scsi/dev.c/Makefile index 4e7a5fa93..dafe9f6c3 100644 --- a/test/unit/lib/scsi/dev.c/Makefile +++ b/test/unit/lib/scsi/dev.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = dev_ut.c diff --git a/test/unit/lib/scsi/lun.c/Makefile b/test/unit/lib/scsi/lun.c/Makefile index 22841b0d3..43a11273a 100644 --- a/test/unit/lib/scsi/lun.c/Makefile +++ b/test/unit/lib/scsi/lun.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = lun_ut.c diff --git a/test/unit/lib/scsi/scsi.c/Makefile b/test/unit/lib/scsi/scsi.c/Makefile index 868936534..7fb9f56f7 100644 --- a/test/unit/lib/scsi/scsi.c/Makefile +++ b/test/unit/lib/scsi/scsi.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = trace TEST_FILE = scsi_ut.c diff --git a/test/unit/lib/scsi/scsi_bdev.c/Makefile b/test/unit/lib/scsi/scsi_bdev.c/Makefile index abb1de50d..9371beaf5 100644 --- a/test/unit/lib/scsi/scsi_bdev.c/Makefile +++ b/test/unit/lib/scsi/scsi_bdev.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = scsi_bdev_ut.c diff --git a/test/unit/lib/sock/sock.c/Makefile b/test/unit/lib/sock/sock.c/Makefile index 845c9aded..5b5ee2d27 100644 --- a/test/unit/lib/sock/sock.c/Makefile +++ b/test/unit/lib/sock/sock.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = sock_ut.c diff --git a/test/unit/lib/thread/thread.c/Makefile b/test/unit/lib/thread/thread.c/Makefile index 23cfa45a5..cd2025416 100644 --- a/test/unit/lib/thread/thread.c/Makefile +++ b/test/unit/lib/thread/thread.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk TEST_FILE = thread_ut.c diff --git a/test/unit/lib/util/base64.c/Makefile b/test/unit/lib/util/base64.c/Makefile index ff6c92142..d103efa14 100644 --- a/test/unit/lib/util/base64.c/Makefile +++ b/test/unit/lib/util/base64.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = base64_ut.c diff --git a/test/unit/lib/util/bit_array.c/Makefile b/test/unit/lib/util/bit_array.c/Makefile index b7f8e3f6d..c6ecb8de9 100644 --- a/test/unit/lib/util/bit_array.c/Makefile +++ b/test/unit/lib/util/bit_array.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = bit_array_ut.c diff --git a/test/unit/lib/util/cpuset.c/Makefile b/test/unit/lib/util/cpuset.c/Makefile index da7a14009..56f7b6e66 100644 --- a/test/unit/lib/util/cpuset.c/Makefile +++ b/test/unit/lib/util/cpuset.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = cpuset_ut.c diff --git a/test/unit/lib/util/crc16.c/Makefile b/test/unit/lib/util/crc16.c/Makefile index 6b8b2ad4b..00febc453 100644 --- a/test/unit/lib/util/crc16.c/Makefile +++ b/test/unit/lib/util/crc16.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = crc16_ut.c diff --git a/test/unit/lib/util/crc32_ieee.c/Makefile b/test/unit/lib/util/crc32_ieee.c/Makefile index 000e1ba68..91d98d69f 100644 --- a/test/unit/lib/util/crc32_ieee.c/Makefile +++ b/test/unit/lib/util/crc32_ieee.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = crc32_ieee_ut.c diff --git a/test/unit/lib/util/crc32c.c/Makefile b/test/unit/lib/util/crc32c.c/Makefile index eba81722a..0221218af 100644 --- a/test/unit/lib/util/crc32c.c/Makefile +++ b/test/unit/lib/util/crc32c.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = crc32c_ut.c diff --git a/test/unit/lib/util/string.c/Makefile b/test/unit/lib/util/string.c/Makefile index 8ee119093..4b7220b3d 100644 --- a/test/unit/lib/util/string.c/Makefile +++ b/test/unit/lib/util/string.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk TEST_FILE = string_ut.c diff --git a/test/unit/lib/vhost/vhost.c/Makefile b/test/unit/lib/vhost/vhost.c/Makefile index 3c30f5a81..25d266573 100644 --- a/test/unit/lib/vhost/vhost.c/Makefile +++ b/test/unit/lib/vhost/vhost.c/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost CFLAGS += $(ENV_CFLAGS)