diff --git a/Makefile.inc b/Makefile.inc index e71bb6993c2..0feaaa8a412 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -132,11 +132,11 @@ help: %: $(Q)$(call zephyrmake,$(O),$@) -KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/kernel.config +OVERLAY_CONFIG += $(ZEPHYR_BASE)/kernel/configs/kernel.config $(DOTCONFIG): $(BOARDCONFIG) $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE) $(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \ - -q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $(KERNEL_CONFIG) $(CONF_FILE) \ + -q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $(OVERLAY_CONFIG) $(CONF_FILE) \ $(wildcard $(O)/*.conf) $(Q)$(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) PROJECT=$(PROJECT_BASE) oldnoconfig diff --git a/Makefile.test b/Makefile.test new file mode 100644 index 00000000000..b616e816e5f --- /dev/null +++ b/Makefile.test @@ -0,0 +1,4 @@ + +OVERLAY_CONFIG += $(ZEPHYR_BASE)/tests/include/test.config + +include ${ZEPHYR_BASE}/Makefile.inc diff --git a/samples/hello_world/Makefile b/samples/hello_world/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/samples/hello_world/Makefile +++ b/samples/hello_world/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/samples/synchronization/Makefile b/samples/synchronization/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/samples/synchronization/Makefile +++ b/samples/synchronization/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/bluetooth/init/Makefile b/tests/bluetooth/init/Makefile index 4585673092b..f793bc99c6b 100644 --- a/tests/bluetooth/init/Makefile +++ b/tests/bluetooth/init/Makefile @@ -2,4 +2,4 @@ BOARD ?= qemu_x86 CONF_FILE ?= prj.conf QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/bluetooth/shell/Makefile b/tests/bluetooth/shell/Makefile index 2f56a57b983..b15f9c53969 100644 --- a/tests/bluetooth/shell/Makefile +++ b/tests/bluetooth/shell/Makefile @@ -29,5 +29,5 @@ endif PRJ_INCPATH += ${ZEPHYR_BASE}/include/drivers -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test # console handler diff --git a/tests/bluetooth/test_bluetooth/Makefile b/tests/bluetooth/test_bluetooth/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/bluetooth/test_bluetooth/Makefile +++ b/tests/bluetooth/test_bluetooth/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/bluetooth/tester/Makefile b/tests/bluetooth/tester/Makefile index 07fb05e9503..42212c42b44 100644 --- a/tests/bluetooth/tester/Makefile +++ b/tests/bluetooth/tester/Makefile @@ -30,4 +30,4 @@ QEMU_EXTRA_FLAGS += -serial pipe:/tmp/bt-stack-tester PRJ_INCPATH += ${ZEPHYR_BASE}/include/drivers -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/booting/stub/Makefile b/tests/booting/stub/Makefile index cf4e1808f35..7ead7aeb6cf 100644 --- a/tests/booting/stub/Makefile +++ b/tests/booting/stub/Makefile @@ -1,3 +1,3 @@ CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/crypto/test_aes/Makefile b/tests/crypto/test_aes/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_aes/Makefile +++ b/tests/crypto/test_aes/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_cbc_mode/Makefile b/tests/crypto/test_cbc_mode/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_cbc_mode/Makefile +++ b/tests/crypto/test_cbc_mode/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_ccm_mode/Makefile b/tests/crypto/test_ccm_mode/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_ccm_mode/Makefile +++ b/tests/crypto/test_ccm_mode/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_cmac_mode/Makefile b/tests/crypto/test_cmac_mode/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_cmac_mode/Makefile +++ b/tests/crypto/test_cmac_mode/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_ctr_mode/Makefile b/tests/crypto/test_ctr_mode/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_ctr_mode/Makefile +++ b/tests/crypto/test_ctr_mode/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_ctr_prng/Makefile b/tests/crypto/test_ctr_prng/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_ctr_prng/Makefile +++ b/tests/crypto/test_ctr_prng/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_ecc_dh/Makefile b/tests/crypto/test_ecc_dh/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_ecc_dh/Makefile +++ b/tests/crypto/test_ecc_dh/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_ecc_dsa/Makefile b/tests/crypto/test_ecc_dsa/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_ecc_dsa/Makefile +++ b/tests/crypto/test_ecc_dsa/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_hmac/Makefile b/tests/crypto/test_hmac/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_hmac/Makefile +++ b/tests/crypto/test_hmac/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_hmac_prng/Makefile b/tests/crypto/test_hmac_prng/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_hmac_prng/Makefile +++ b/tests/crypto/test_hmac_prng/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/crypto/test_mbedtls/Makefile b/tests/crypto/test_mbedtls/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/crypto/test_mbedtls/Makefile +++ b/tests/crypto/test_mbedtls/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/crypto/test_sha256/Makefile b/tests/crypto/test_sha256/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/crypto/test_sha256/Makefile +++ b/tests/crypto/test_sha256/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/drivers/adc/Makefile b/tests/drivers/adc/Makefile index 044e303017f..6ce74c16293 100644 --- a/tests/drivers/adc/Makefile +++ b/tests/drivers/adc/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_ss_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/aio/aio_basic_api/Makefile b/tests/drivers/aio/aio_basic_api/Makefile index b0b666b6980..0e0de3a6b29 100644 --- a/tests/drivers/aio/aio_basic_api/Makefile +++ b/tests/drivers/aio/aio_basic_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/aon_counter/Makefile b/tests/drivers/aon_counter/Makefile index 1efa1edc8b9..20dc0fa463f 100644 --- a/tests/drivers/aon_counter/Makefile +++ b/tests/drivers/aon_counter/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_d2000_crb CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/build_all/Makefile b/tests/drivers/build_all/Makefile index e3dfdb0fbbf..a844eae0c0f 100644 --- a/tests/drivers/build_all/Makefile +++ b/tests/drivers/build_all/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = drivers.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/dma/test_chan_blen_transfer/Makefile b/tests/drivers/dma/test_chan_blen_transfer/Makefile index 82003d355ab..c194e141542 100644 --- a/tests/drivers/dma/test_chan_blen_transfer/Makefile +++ b/tests/drivers/dma/test_chan_blen_transfer/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf # set prj_shell.conf if debugging tc -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/dma/test_loop_transfer/Makefile b/tests/drivers/dma/test_loop_transfer/Makefile index aee0c93a6c7..82fb58a9348 100644 --- a/tests/drivers/dma/test_loop_transfer/Makefile +++ b/tests/drivers/dma/test_loop_transfer/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/enc28j60/Makefile b/tests/drivers/enc28j60/Makefile index aee0c93a6c7..82fb58a9348 100644 --- a/tests/drivers/enc28j60/Makefile +++ b/tests/drivers/enc28j60/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/gpio/gpio_basic_api/Makefile b/tests/drivers/gpio/gpio_basic_api/Makefile index b0b666b6980..0e0de3a6b29 100644 --- a/tests/drivers/gpio/gpio_basic_api/Makefile +++ b/tests/drivers/gpio/gpio_basic_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/nsim_uart/Makefile b/tests/drivers/nsim_uart/Makefile index 1d05ac6070b..4a2bc3ffb30 100644 --- a/tests/drivers/nsim_uart/Makefile +++ b/tests/drivers/nsim_uart/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101_sss CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/pci_enum/Makefile b/tests/drivers/pci_enum/Makefile index cfa14bde5ba..2091e4d7c4d 100644 --- a/tests/drivers/pci_enum/Makefile +++ b/tests/drivers/pci_enum/Makefile @@ -6,4 +6,4 @@ else CONF_FILE = prj.conf endif -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/pinmux/Makefile b/tests/drivers/pinmux/Makefile index 0306df6649f..89db14ab929 100644 --- a/tests/drivers/pinmux/Makefile +++ b/tests/drivers/pinmux/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101 CONF_FILE = prj_$(BOARD).conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/quark_clock/Makefile b/tests/drivers/quark_clock/Makefile index aee0c93a6c7..82fb58a9348 100644 --- a/tests/drivers/quark_clock/Makefile +++ b/tests/drivers/quark_clock/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/rtc/rtc_basic_api/Makefile b/tests/drivers/rtc/rtc_basic_api/Makefile index b0b666b6980..0e0de3a6b29 100644 --- a/tests/drivers/rtc/rtc_basic_api/Makefile +++ b/tests/drivers/rtc/rtc_basic_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/spi_test/Makefile b/tests/drivers/spi_test/Makefile index b0b666b6980..0e0de3a6b29 100644 --- a/tests/drivers/spi_test/Makefile +++ b/tests/drivers/spi_test/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/uart/Makefile b/tests/drivers/uart/Makefile index b0b666b6980..0e0de3a6b29 100644 --- a/tests/drivers/uart/Makefile +++ b/tests/drivers/uart/Makefile @@ -1,4 +1,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/drivers/watchdog/wdt_basic_api/Makefile b/tests/drivers/watchdog/wdt_basic_api/Makefile index 72f4b496150..f19a95b1034 100644 --- a/tests/drivers/watchdog/wdt_basic_api/Makefile +++ b/tests/drivers/watchdog/wdt_basic_api/Makefile @@ -2,4 +2,4 @@ BOARD ?= quark_se_c1000_devboard CONF_FILE = prj.conf #CFLAGS=-DINT_RESET -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/fs/fat_fs/Makefile b/tests/fs/fat_fs/Makefile index aee0c93a6c7..82fb58a9348 100644 --- a/tests/fs/fat_fs/Makefile +++ b/tests/fs/fat_fs/Makefile @@ -1,4 +1,4 @@ BOARD ?= arduino_101 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/include/test.config b/tests/include/test.config new file mode 100644 index 00000000000..ab99168e54b --- /dev/null +++ b/tests/include/test.config @@ -0,0 +1,2 @@ +CONFIG_BOOT_BANNER=y +CONFIG_BUILD_TIMESTAMP=y diff --git a/tests/kernel/alert/test_alert_api/Makefile b/tests/kernel/alert/test_alert_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/alert/test_alert_api/Makefile +++ b/tests/kernel/alert/test_alert_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/arm_irq_vector_table/Makefile b/tests/kernel/arm_irq_vector_table/Makefile index a1b9f6e80e3..b34393f90fd 100644 --- a/tests/kernel/arm_irq_vector_table/Makefile +++ b/tests/kernel/arm_irq_vector_table/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_cortex_m3 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/arm_runtime_nmi/Makefile b/tests/kernel/arm_runtime_nmi/Makefile index a1b9f6e80e3..b34393f90fd 100644 --- a/tests/kernel/arm_runtime_nmi/Makefile +++ b/tests/kernel/arm_runtime_nmi/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_cortex_m3 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/bitfield/Makefile b/tests/kernel/bitfield/Makefile index 6f788778c9f..2ba946bc67f 100644 --- a/tests/kernel/bitfield/Makefile +++ b/tests/kernel/bitfield/Makefile @@ -1,3 +1,3 @@ BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/common/Makefile b/tests/kernel/common/Makefile index 7adff3fb623..033220fecaf 100644 --- a/tests/kernel/common/Makefile +++ b/tests/kernel/common/Makefile @@ -1,4 +1,4 @@ CONF_FILE ?= prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/context/Makefile b/tests/kernel/context/Makefile index 7adff3fb623..033220fecaf 100644 --- a/tests/kernel/context/Makefile +++ b/tests/kernel/context/Makefile @@ -1,4 +1,4 @@ CONF_FILE ?= prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/critical/Makefile b/tests/kernel/critical/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/critical/Makefile +++ b/tests/kernel/critical/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/ipm/Makefile b/tests/kernel/ipm/Makefile index 3dcf7e1ac3a..0e3639588df 100644 --- a/tests/kernel/ipm/Makefile +++ b/tests/kernel/ipm/Makefile @@ -1,4 +1,4 @@ CONF_FILE = prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/kernel/mbox/mbox_api/Makefile b/tests/kernel/mbox/mbox_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/mbox/mbox_api/Makefile +++ b/tests/kernel/mbox/mbox_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/mem_slab/Makefile b/tests/kernel/mem_slab/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/mem_slab/Makefile +++ b/tests/kernel/mem_slab/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/msgq/msgq_api/Makefile b/tests/kernel/msgq/msgq_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/msgq/msgq_api/Makefile +++ b/tests/kernel/msgq/msgq_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/multilib/Makefile b/tests/kernel/multilib/Makefile index b3884da2bf6..dfa3a4c1462 100644 --- a/tests/kernel/multilib/Makefile +++ b/tests/kernel/multilib/Makefile @@ -2,4 +2,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/mutex/mutex_api/Makefile b/tests/kernel/mutex/mutex_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/mutex/mutex_api/Makefile +++ b/tests/kernel/mutex/mutex_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/semaphore/sema_api/Makefile b/tests/kernel/semaphore/sema_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/semaphore/sema_api/Makefile +++ b/tests/kernel/semaphore/sema_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/sprintf/Makefile b/tests/kernel/sprintf/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/sprintf/Makefile +++ b/tests/kernel/sprintf/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/stack/stack_api/Makefile b/tests/kernel/stack/stack_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/stack/stack_api/Makefile +++ b/tests/kernel/stack/stack_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/stackprot/Makefile b/tests/kernel/stackprot/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/stackprot/Makefile +++ b/tests/kernel/stackprot/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/test_build/Makefile b/tests/kernel/test_build/Makefile index 2550d4da4eb..af6a05ad84c 100644 --- a/tests/kernel/test_build/Makefile +++ b/tests/kernel/test_build/Makefile @@ -2,4 +2,4 @@ BOARD ?= qemu_x86 CONF_FILE ?= debug.conf SOURCE_DIR = $(ZEPHYR_BASE)/samples/synchronization/src/ -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/Makefile b/tests/kernel/threads_lifecycle/lifecycle_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/threads_lifecycle/lifecycle_api/Makefile +++ b/tests/kernel/threads_lifecycle/lifecycle_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/threads_lifecycle/thread_init/Makefile b/tests/kernel/threads_lifecycle/thread_init/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/threads_lifecycle/thread_init/Makefile +++ b/tests/kernel/threads_lifecycle/thread_init/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/threads_scheduling/schedule_api/Makefile b/tests/kernel/threads_scheduling/schedule_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/threads_scheduling/schedule_api/Makefile +++ b/tests/kernel/threads_scheduling/schedule_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/workq/workq_api/Makefile b/tests/kernel/workq/workq_api/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/workq/workq_api/Makefile +++ b/tests/kernel/workq/workq_api/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/kernel/xip/Makefile b/tests/kernel/xip/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/kernel/xip/Makefile +++ b/tests/kernel/xip/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/benchmark/app_kernel/Makefile b/tests/legacy/benchmark/app_kernel/Makefile index a56db2db4f3..b8375da6ba7 100644 --- a/tests/legacy/benchmark/app_kernel/Makefile +++ b/tests/legacy/benchmark/app_kernel/Makefile @@ -10,4 +10,4 @@ ifeq ($(CONF_FILE),) CONF_FILE = prj_no_fp.conf endif -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/benchmark/boot_time/microkernel/Makefile b/tests/legacy/benchmark/boot_time/microkernel/Makefile index 337b4beaba4..1b1633b456c 100644 --- a/tests/legacy/benchmark/boot_time/microkernel/Makefile +++ b/tests/legacy/benchmark/boot_time/microkernel/Makefile @@ -10,4 +10,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = ${CONF_${BOARD}} -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/benchmark/boot_time/nanokernel/Makefile b/tests/legacy/benchmark/boot_time/nanokernel/Makefile index c2f6801764d..ea33db547a6 100644 --- a/tests/legacy/benchmark/boot_time/nanokernel/Makefile +++ b/tests/legacy/benchmark/boot_time/nanokernel/Makefile @@ -9,4 +9,4 @@ CONF_arduino_101 = quark_se/quark_se_prj.conf BOARD ?= qemu_x86 CONF_FILE = $(CONF_$(BOARD)) -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/benchmark/footprint/microkernel/Makefile b/tests/legacy/benchmark/footprint/microkernel/Makefile index dce856870b5..8e9b34d60c9 100644 --- a/tests/legacy/benchmark/footprint/microkernel/Makefile +++ b/tests/legacy/benchmark/footprint/microkernel/Makefile @@ -11,7 +11,7 @@ else CFLAGS += -DTEST_$(TEST) endif -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test ifeq ($(ARCH),ARM) ifneq ($(TEST),min) diff --git a/tests/legacy/benchmark/footprint/nanokernel/Makefile b/tests/legacy/benchmark/footprint/nanokernel/Makefile index 52a541ee614..aec5cadb34e 100644 --- a/tests/legacy/benchmark/footprint/nanokernel/Makefile +++ b/tests/legacy/benchmark/footprint/nanokernel/Makefile @@ -10,7 +10,7 @@ else CFLAGS += -DTEST_$(TEST) endif -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test ifeq ($(ARCH),ARM) ifneq ($(TEST),min) diff --git a/tests/legacy/benchmark/latency_measure/Makefile b/tests/legacy/benchmark/latency_measure/Makefile index c71193f6c6b..d52c6558520 100644 --- a/tests/legacy/benchmark/latency_measure/Makefile +++ b/tests/legacy/benchmark/latency_measure/Makefile @@ -11,4 +11,4 @@ else CONF_FILE = prj.conf endif -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/benchmark/object_footprint/Makefile b/tests/legacy/benchmark/object_footprint/Makefile index b3d7519d807..44fa4ec5ca3 100644 --- a/tests/legacy/benchmark/object_footprint/Makefile +++ b/tests/legacy/benchmark/object_footprint/Makefile @@ -6,4 +6,4 @@ CONF_FILE ?= prj1.conf KBUILD_KCONFIG = $(PWD)/Kconfig export KBUILD_KCONFIG -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/benchmark/sys_kernel/Makefile b/tests/legacy/benchmark/sys_kernel/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/legacy/benchmark/sys_kernel/Makefile +++ b/tests/legacy/benchmark/sys_kernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_arm_irq_vector_table/Makefile b/tests/legacy/kernel/test_arm_irq_vector_table/Makefile index a1b9f6e80e3..b34393f90fd 100644 --- a/tests/legacy/kernel/test_arm_irq_vector_table/Makefile +++ b/tests/legacy/kernel/test_arm_irq_vector_table/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_cortex_m3 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_context/Makefile b/tests/legacy/kernel/test_context/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/legacy/kernel/test_context/Makefile +++ b/tests/legacy/kernel/test_context/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_critical/Makefile b/tests/legacy/kernel/test_critical/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_critical/Makefile +++ b/tests/legacy/kernel/test_critical/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_early_sleep/Makefile b/tests/legacy/kernel/test_early_sleep/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_early_sleep/Makefile +++ b/tests/legacy/kernel/test_early_sleep/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_errno/Makefile b/tests/legacy/kernel/test_errno/Makefile index b3884da2bf6..dfa3a4c1462 100644 --- a/tests/legacy/kernel/test_errno/Makefile +++ b/tests/legacy/kernel/test_errno/Makefile @@ -2,4 +2,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_events/Makefile b/tests/legacy/kernel/test_events/Makefile index 4afd7aeaad2..cab3d40bce7 100644 --- a/tests/legacy/kernel/test_events/Makefile +++ b/tests/legacy/kernel/test_events/Makefile @@ -3,4 +3,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_fifo/microkernel/Makefile b/tests/legacy/kernel/test_fifo/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_fifo/microkernel/Makefile +++ b/tests/legacy/kernel/test_fifo/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_fifo/nanokernel/Makefile b/tests/legacy/kernel/test_fifo/nanokernel/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/legacy/kernel/test_fifo/nanokernel/Makefile +++ b/tests/legacy/kernel/test_fifo/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_fifo_priv/Makefile b/tests/legacy/kernel/test_fifo_priv/Makefile index 32b9f55f117..20b9b998137 100644 --- a/tests/legacy/kernel/test_fifo_priv/Makefile +++ b/tests/legacy/kernel/test_fifo_priv/Makefile @@ -5,4 +5,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_fifo/microkernel/src # Enable testing for private microkernel FIFOs CFLAGS = -DTEST_PRIV_FIFO -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/Makefile b/tests/legacy/kernel/test_fp_sharing/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_fp_sharing/microkernel/Makefile +++ b/tests/legacy/kernel/test_fp_sharing/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/Makefile b/tests/legacy/kernel/test_fp_sharing/nanokernel/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/legacy/kernel/test_fp_sharing/nanokernel/Makefile +++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_irq_offload/Makefile b/tests/legacy/kernel/test_irq_offload/Makefile index b3884da2bf6..dfa3a4c1462 100644 --- a/tests/legacy/kernel/test_irq_offload/Makefile +++ b/tests/legacy/kernel/test_irq_offload/Makefile @@ -2,4 +2,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_libs/Makefile b/tests/legacy/kernel/test_libs/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_libs/Makefile +++ b/tests/legacy/kernel/test_libs/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_lifo/Makefile b/tests/legacy/kernel/test_lifo/Makefile index 3dcf7e1ac3a..0e3639588df 100644 --- a/tests/legacy/kernel/test_lifo/Makefile +++ b/tests/legacy/kernel/test_lifo/Makefile @@ -1,4 +1,4 @@ CONF_FILE = prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_mail/Makefile b/tests/legacy/kernel/test_mail/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_mail/Makefile +++ b/tests/legacy/kernel/test_mail/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_mail_priv/Makefile b/tests/legacy/kernel/test_mail_priv/Makefile index f63d3fb3867..67790b047f5 100644 --- a/tests/legacy/kernel/test_mail_priv/Makefile +++ b/tests/legacy/kernel/test_mail_priv/Makefile @@ -6,4 +6,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_mail/src # Enable testing for private microkernel mailboxes CFLAGS = -DTEST_PRIV_MBX -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_map/Makefile b/tests/legacy/kernel/test_map/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_map/Makefile +++ b/tests/legacy/kernel/test_map/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_map_priv/Makefile b/tests/legacy/kernel/test_map_priv/Makefile index 15539608b95..391aabd74c0 100644 --- a/tests/legacy/kernel/test_map_priv/Makefile +++ b/tests/legacy/kernel/test_map_priv/Makefile @@ -6,4 +6,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_map/src # Enable testing for private microkernel memory map objects CFLAGS = -DTEST_PRIV_MEM_MAPS -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_mem_safe/Makefile b/tests/legacy/kernel/test_mem_safe/Makefile index 09e26e109ae..579bb3ce54c 100644 --- a/tests/legacy/kernel/test_mem_safe/Makefile +++ b/tests/legacy/kernel/test_mem_safe/Makefile @@ -10,4 +10,4 @@ ifneq ($(valid_board_$(BOARD)),y) $(error not a supported board for this testcase) endif -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_mutex/Makefile b/tests/legacy/kernel/test_mutex/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_mutex/Makefile +++ b/tests/legacy/kernel/test_mutex/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_nano_work/Makefile b/tests/legacy/kernel/test_nano_work/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/legacy/kernel/test_nano_work/Makefile +++ b/tests/legacy/kernel/test_nano_work/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/Makefile b/tests/legacy/kernel/test_obj_tracing/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_obj_tracing/microkernel/Makefile +++ b/tests/legacy/kernel/test_obj_tracing/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/Makefile b/tests/legacy/kernel/test_obj_tracing/nanokernel/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/legacy/kernel/test_obj_tracing/nanokernel/Makefile +++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_pend/Makefile b/tests/legacy/kernel/test_pend/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_pend/Makefile +++ b/tests/legacy/kernel/test_pend/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_pipe/Makefile b/tests/legacy/kernel/test_pipe/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_pipe/Makefile +++ b/tests/legacy/kernel/test_pipe/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_pipe_priv/Makefile b/tests/legacy/kernel/test_pipe_priv/Makefile index 97f3404e4ae..b5d50f3fbb1 100644 --- a/tests/legacy/kernel/test_pipe_priv/Makefile +++ b/tests/legacy/kernel/test_pipe_priv/Makefile @@ -6,4 +6,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_pipe/src # Enable testing for private microkernel pipe objects CFLAGS = -DTEST_PRIV_PIPES -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_pool/Makefile b/tests/legacy/kernel/test_pool/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_pool/Makefile +++ b/tests/legacy/kernel/test_pool/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_sema/microkernel/Makefile b/tests/legacy/kernel/test_sema/microkernel/Makefile index bf13f05ae76..4f2365f13db 100644 --- a/tests/legacy/kernel/test_sema/microkernel/Makefile +++ b/tests/legacy/kernel/test_sema/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE ?= prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_sema/nanokernel/Makefile b/tests/legacy/kernel/test_sema/nanokernel/Makefile index 3dcf7e1ac3a..0e3639588df 100644 --- a/tests/legacy/kernel/test_sema/nanokernel/Makefile +++ b/tests/legacy/kernel/test_sema/nanokernel/Makefile @@ -1,4 +1,4 @@ CONF_FILE = prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_sema_priv/Makefile b/tests/legacy/kernel/test_sema_priv/Makefile index 27dbd469c41..6e23691f231 100644 --- a/tests/legacy/kernel/test_sema_priv/Makefile +++ b/tests/legacy/kernel/test_sema_priv/Makefile @@ -6,4 +6,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_sema/microkernel/src # Enable testing of private microkernel semaphore CFLAGS = -DTEST_PRIV_KSEM -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_sleep/Makefile b/tests/legacy/kernel/test_sleep/Makefile index 3dcf7e1ac3a..0e3639588df 100644 --- a/tests/legacy/kernel/test_sleep/Makefile +++ b/tests/legacy/kernel/test_sleep/Makefile @@ -1,4 +1,4 @@ CONF_FILE = prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_stack/nanokernel/Makefile b/tests/legacy/kernel/test_stack/nanokernel/Makefile index 3dcf7e1ac3a..0e3639588df 100644 --- a/tests/legacy/kernel/test_stack/nanokernel/Makefile +++ b/tests/legacy/kernel/test_stack/nanokernel/Makefile @@ -1,4 +1,4 @@ CONF_FILE = prj.conf BOARD ?= qemu_x86 -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_stackprot/microkernel/Makefile b/tests/legacy/kernel/test_stackprot/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_stackprot/microkernel/Makefile +++ b/tests/legacy/kernel/test_stackprot/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_stackprot/nanokernel/Makefile b/tests/legacy/kernel/test_stackprot/nanokernel/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/legacy/kernel/test_stackprot/nanokernel/Makefile +++ b/tests/legacy/kernel/test_stackprot/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_static_idt/microkernel/Makefile b/tests/legacy/kernel/test_static_idt/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_static_idt/microkernel/Makefile +++ b/tests/legacy/kernel/test_static_idt/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_static_idt/nanokernel/Makefile b/tests/legacy/kernel/test_static_idt/nanokernel/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/legacy/kernel/test_static_idt/nanokernel/Makefile +++ b/tests/legacy/kernel/test_static_idt/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/legacy/kernel/test_task/Makefile b/tests/legacy/kernel/test_task/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_task/Makefile +++ b/tests/legacy/kernel/test_task/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_task_priv/Makefile b/tests/legacy/kernel/test_task_priv/Makefile index 5aad2c39146..aa1275b0dc4 100644 --- a/tests/legacy/kernel/test_task_priv/Makefile +++ b/tests/legacy/kernel/test_task_priv/Makefile @@ -6,4 +6,4 @@ SOURCE_DIR := $(ZEPHYR_BASE)/tests/legacy/kernel/test_task/src # Enable testing for private microkernel task objects CFLAGS = -DTEST_PRIV_TASKS -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_tickless/microkernel/Makefile b/tests/legacy/kernel/test_tickless/microkernel/Makefile index 723985da331..ce5df3c86d8 100644 --- a/tests/legacy/kernel/test_tickless/microkernel/Makefile +++ b/tests/legacy/kernel/test_tickless/microkernel/Makefile @@ -10,4 +10,4 @@ else CONF_FILE = prj.conf endif -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_timer/microkernel/Makefile b/tests/legacy/kernel/test_timer/microkernel/Makefile index 3ec95dde9c1..16bcd6916d3 100644 --- a/tests/legacy/kernel/test_timer/microkernel/Makefile +++ b/tests/legacy/kernel/test_timer/microkernel/Makefile @@ -2,4 +2,4 @@ MDEF_FILE = prj.mdef BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/legacy/kernel/test_timer/nanokernel/Makefile b/tests/legacy/kernel/test_timer/nanokernel/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/legacy/kernel/test_timer/nanokernel/Makefile +++ b/tests/legacy/kernel/test_timer/nanokernel/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/6lo/Makefile b/tests/net/6lo/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/6lo/Makefile +++ b/tests/net/6lo/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/arp/Makefile b/tests/net/arp/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/arp/Makefile +++ b/tests/net/arp/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/buf/Makefile b/tests/net/buf/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/buf/Makefile +++ b/tests/net/buf/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/context/Makefile b/tests/net/context/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/context/Makefile +++ b/tests/net/context/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/dhcpv4/Makefile b/tests/net/dhcpv4/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/dhcpv4/Makefile +++ b/tests/net/dhcpv4/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/icmpv6/Makefile b/tests/net/icmpv6/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/icmpv6/Makefile +++ b/tests/net/icmpv6/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/ieee802154/fragment/Makefile b/tests/net/ieee802154/fragment/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/ieee802154/fragment/Makefile +++ b/tests/net/ieee802154/fragment/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/ieee802154/l2/Makefile b/tests/net/ieee802154/l2/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/ieee802154/l2/Makefile +++ b/tests/net/ieee802154/l2/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/ip-addr/Makefile b/tests/net/ip-addr/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/ip-addr/Makefile +++ b/tests/net/ip-addr/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/ipv6/Makefile b/tests/net/ipv6/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/ipv6/Makefile +++ b/tests/net/ipv6/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/lib/http_header_fields/Makefile b/tests/net/lib/http_header_fields/Makefile index f6b8735d3a0..4136dcf9117 100644 --- a/tests/net/lib/http_header_fields/Makefile +++ b/tests/net/lib/http_header_fields/Makefile @@ -17,4 +17,4 @@ BOARD ?= qemu_x86 CONF_FILE ?= prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/lib/mqtt_packet/Makefile b/tests/net/lib/mqtt_packet/Makefile index 7df371c9817..eca21e4e4fa 100644 --- a/tests/net/lib/mqtt_packet/Makefile +++ b/tests/net/lib/mqtt_packet/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE ?= prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/lib/zoap/Makefile b/tests/net/lib/zoap/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/lib/zoap/Makefile +++ b/tests/net/lib/zoap/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/mgmt/Makefile b/tests/net/mgmt/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/mgmt/Makefile +++ b/tests/net/mgmt/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/nbuf/Makefile b/tests/net/nbuf/Makefile index 7df371c9817..eca21e4e4fa 100644 --- a/tests/net/nbuf/Makefile +++ b/tests/net/nbuf/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE ?= prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/neighbor/Makefile b/tests/net/neighbor/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/neighbor/Makefile +++ b/tests/net/neighbor/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/route/Makefile b/tests/net/route/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/route/Makefile +++ b/tests/net/route/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/rpl/Makefile b/tests/net/rpl/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/rpl/Makefile +++ b/tests/net/rpl/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/tcp/Makefile b/tests/net/tcp/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/tcp/Makefile +++ b/tests/net/tcp/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/trickle/Makefile b/tests/net/trickle/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/trickle/Makefile +++ b/tests/net/trickle/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/udp/Makefile b/tests/net/udp/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/udp/Makefile +++ b/tests/net/udp/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/net/utils/Makefile b/tests/net/utils/Makefile index 5647baa56ec..4b05dca8edb 100644 --- a/tests/net/utils/Makefile +++ b/tests/net/utils/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include $(ZEPHYR_BASE)/Makefile.inc +include $(ZEPHYR_BASE)/Makefile.test diff --git a/tests/power/power_states/Makefile b/tests/power/power_states/Makefile index 723e9581ff3..55a649e37f2 100644 --- a/tests/power/power_states/Makefile +++ b/tests/power/power_states/Makefile @@ -1,4 +1,4 @@ BOARD = quark_se_c1000_devboard CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/subsys/debug/gdb_server/Makefile b/tests/subsys/debug/gdb_server/Makefile index 4de50f93d4d..e70a750a88d 100644 --- a/tests/subsys/debug/gdb_server/Makefile +++ b/tests/subsys/debug/gdb_server/Makefile @@ -1,4 +1,4 @@ BOARD ?= qemu_x86 CONF_FILE = prj.conf -include ${ZEPHYR_BASE}/Makefile.inc +include ${ZEPHYR_BASE}/Makefile.test diff --git a/tests/ztest/test/base/Makefile b/tests/ztest/test/base/Makefile index 7f40f996233..a072b89ebf3 100644 --- a/tests/ztest/test/base/Makefile +++ b/tests/ztest/test/base/Makefile @@ -3,7 +3,7 @@ BOARD ?= qemu_x86 ifneq ($(BOARD), unit_testing) CONF_FILE ?= prj_verbose_0.conf - include $(ZEPHYR_BASE)/Makefile.inc + include $(ZEPHYR_BASE)/Makefile.test else OBJECTS = src/main.o include $(ZEPHYR_BASE)/tests/unit/Makefile.unittest diff --git a/tests/ztest/test/mock/Makefile b/tests/ztest/test/mock/Makefile index a5e4c702dab..d35821b1a54 100644 --- a/tests/ztest/test/mock/Makefile +++ b/tests/ztest/test/mock/Makefile @@ -3,7 +3,7 @@ BOARD ?= qemu_x86 ifneq ($(BOARD), unit_testing) CONF_FILE ?= prj.conf - include $(ZEPHYR_BASE)/Makefile.inc + include $(ZEPHYR_BASE)/Makefile.test else OBJECTS = src/main.o include $(ZEPHYR_BASE)/tests/unit/Makefile.unittest