update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / mk / spdk.unittest.mk

diff --git a/ceph/src/spdk/mk/spdk.unittest.mk b/ceph/src/spdk/mk/spdk.unittest.mk
index 0260f67c83a927144a2c8784b94c4ed78bfb67a3..01d2bc3ec8921cbe9fccecca923da5927742e7ac 100644 (file)
--- a/ceph/src/spdk/mk/spdk.unittest.mk
+++ b/ceph/src/spdk/mk/spdk.unittest.mk
@@ -35,9 +35,19 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
 
+# We don't want to run scan-build against the unit tests
+# because it can't understand our mock function macros and
+# throws false positives because of them.
+
+# Scan-build inserts a phony compiler by overriding the value
+# of CC, so we store the original CC under DEFAULT_CC and
+# re-assign it here.
+override CC=$(DEFAULT_CC)
+
 C_SRCS = $(TEST_FILE)
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
+CFLAGS += -I$(SPDK_ROOT_DIR)/module
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -ffunction-sections
 LDFLAGS += -Wl,--gc-sections
@@ -50,6 +60,9 @@ APP = $(TEST_FILE:.c=)
 
 ifneq ($(UNIT_TEST_LINK_ENV),1)
 ENV_LINKER_ARGS =
+else
+# Rewrite the env linker args to be static.
+ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)
 endif
 
 install: all