Commit 9c2aea2a authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I23d39e8084f79442fb06ae9b5a6a68d6134adff4

Reviewed-on: https://review.gerrithub.io/434281


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 40f38004

test/env/memory/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

test/env/pci/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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)

test/env/vtophys/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

test/unit/include/spdk/histogram_data.h/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

test/unit/lib/bdev/bdev.c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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