tests/Makefile.inc: Add missing include paths to TEST_CFLAGS

Add missing paths to common tests cflags and remove these paths from
individual tests configuration.

Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: I13cb336195bfb06b861d7f403822f06bec8a40aa
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56933
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
This commit is contained in:
Jakub Czapiga 2021-08-09 15:51:37 +02:00 committed by Nick Vaccaro
parent 9bf716ede0
commit d0bd012b5e
2 changed files with 3 additions and 6 deletions

View File

@ -35,8 +35,9 @@ TEST_CFLAGS := -include $(src)/include/kconfig.h \
# Include generic test mock headers, before original ones # Include generic test mock headers, before original ones
TEST_CFLAGS += -I$(testsrc)/include/mocks -I$(testsrc)/include TEST_CFLAGS += -I$(testsrc)/include/mocks -I$(testsrc)/include
TEST_CFLAGS += -I$(src)/include -I$(src)/commonlib/include \ TEST_CFLAGS += -I$(src) -I$(src)/include -I$(src)/commonlib/include \
-I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include -I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include \
-I$(top)/3rdparty/vboot/firmware/include
# Note: This is intentionally just a subset of the warnings in the toplevel # Note: This is intentionally just a subset of the warnings in the toplevel
# Makefile.inc. We don't need to be as strict with test code, and things like # Makefile.inc. We don't need to be as strict with test code, and things like

View File

@ -73,7 +73,6 @@ fmap-test-srcs += tests/stubs/console.c
fmap-test-srcs += src/lib/boot_device.c fmap-test-srcs += src/lib/boot_device.c
fmap-test-srcs += src/commonlib/region.c fmap-test-srcs += src/commonlib/region.c
fmap-test-cflags += -I tests/include/tests/lib/fmap fmap-test-cflags += -I tests/include/tests/lib/fmap
fmap-test-cflags += -I 3rdparty/vboot/firmware/include
imd_cbmem-ramstage-test-stage := ramstage imd_cbmem-ramstage-test-stage := ramstage
imd_cbmem-ramstage-test-srcs += tests/lib/imd_cbmem-test.c imd_cbmem-ramstage-test-srcs += tests/lib/imd_cbmem-test.c
@ -141,7 +140,6 @@ coreboot_table-test-srcs += src/lib/compute_ip_checksum.c
coreboot_table-test-srcs += src/lib/coreboot_table.c coreboot_table-test-srcs += src/lib/coreboot_table.c
coreboot_table-test-srcs += src/lib/imd_cbmem.c coreboot_table-test-srcs += src/lib/imd_cbmem.c
coreboot_table-test-srcs += src/lib/imd.c coreboot_table-test-srcs += src/lib/imd.c
coreboot_table-test-cflags += -I src -I 3rdparty/vboot/firmware/include
coreboot_table-test-cflags += -I tests/include/tests/lib/fmap coreboot_table-test-cflags += -I tests/include/tests/lib/fmap
coreboot_table-test-mocks += cbmem_top_chipset coreboot_table-test-mocks += cbmem_top_chipset
@ -175,8 +173,6 @@ cbmem_stage_cache-test-srcs += tests/stubs/console.c
cbmem_stage_cache-test-srcs += src/lib/cbmem_stage_cache.c cbmem_stage_cache-test-srcs += src/lib/cbmem_stage_cache.c
cbmem_stage_cache-test-srcs += src/lib/imd_cbmem.c cbmem_stage_cache-test-srcs += src/lib/imd_cbmem.c
cbmem_stage_cache-test-srcs += src/lib/imd.c cbmem_stage_cache-test-srcs += src/lib/imd.c
cbmem_stage_cache-test-cflags += -I 3rdparty/vboot/firmware/include
cbmem_stage_cache-test-cflags += -I $(src)/commonlib/include
cbmem_stage_cache-test-config += CONFIG_CBMEM_STAGE_CACHE=1 cbmem_stage_cache-test-config += CONFIG_CBMEM_STAGE_CACHE=1
libgcc-test-srcs += tests/lib/libgcc-test.c libgcc-test-srcs += tests/lib/libgcc-test.c