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

build: remove duplicate spdk.app.mk includes

Browse Source 
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 <james.r.harris@intel.com>
Change-Id: I23d39e8084f79442fb06ae9b5a6a68d6134adff4

Reviewed-on: https://review.gerrithub.io/434281
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2018-11-21 01:34:15 -07:00 committed by Ben Walker
parent 40f3800480
commit 9c2aea2ad5
42 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/env/memory/Makefile vendored
View File

@ -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

1
test/env/pci/Makefile vendored
View File

@ -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)

1
test/env/vtophys/Makefile vendored
View File

@ -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

1
test/unit/include/spdk/histogram_data.h/Makefile
View File

@ -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

1
test/unit/lib/bdev/bdev.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/bdev_raid.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/crypto.c/Makefile
View File

@ -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)

1
test/unit/lib/bdev/gpt/gpt.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/mt/bdev.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/part.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/pmem/Makefile
View File

@ -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

1
test/unit/lib/bdev/scsi_nvme.c/Makefile
View File

@ -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

1
test/unit/lib/bdev/vbdev_lvol.c/Makefile
View File

@ -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

1
test/unit/lib/blob/blob.c/Makefile
View File

@ -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

1
test/unit/lib/blobfs/blobfs_async_ut/Makefile
View File

@ -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

1
test/unit/lib/blobfs/blobfs_sync_ut/Makefile
View File

@ -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

1
test/unit/lib/blobfs/tree.c/Makefile
View File

@ -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

1
test/unit/lib/event/app.c/Makefile
View File

@ -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

1
test/unit/lib/event/subsystem.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/conn.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/init_grp.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/iscsi.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/param.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/portal_grp.c/Makefile
View File

@ -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

1
test/unit/lib/iscsi/tgt_node.c/Makefile
View File

@ -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

1
test/unit/lib/log/log.c/Makefile
View File

@ -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

1
test/unit/lib/lvol/lvol.c/Makefile
View File

@ -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

1
test/unit/lib/reduce/reduce.c/Makefile
View File

@ -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

1
test/unit/lib/scsi/dev.c/Makefile
View File

@ -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

1
test/unit/lib/scsi/lun.c/Makefile
View File

@ -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

1
test/unit/lib/scsi/scsi.c/Makefile
View File

@ -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

1
test/unit/lib/scsi/scsi_bdev.c/Makefile
View File

@ -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

1
test/unit/lib/sock/sock.c/Makefile
View File

@ -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

1
test/unit/lib/thread/thread.c/Makefile
View File

@ -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

1
test/unit/lib/util/base64.c/Makefile
View File

@ -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

1
test/unit/lib/util/bit_array.c/Makefile
View File

@ -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

1
test/unit/lib/util/cpuset.c/Makefile
View File

@ -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

1
test/unit/lib/util/crc16.c/Makefile
View File

@ -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

1
test/unit/lib/util/crc32_ieee.c/Makefile
View File

@ -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

1
test/unit/lib/util/crc32c.c/Makefile
View File

@ -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

1
test/unit/lib/util/string.c/Makefile
View File

@ -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

1
test/unit/lib/vhost/vhost.c/Makefile
View File

@ -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)