fixture: review proposal for zephyrproject-rtos#30594

This is the main part of the proposal. Keeping test fixture overlays under tests, in structure similar to what is described in: https://docs.zephyrproject.org/ latest/guides/dts/howtos.html#set-devicetree-overlays by using: > create a boards/<BOARD>.overlay file in the application folder, for > the current board Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
pabigot · Jan 4, 2021 · 9f97764 · 9f97764
1 parent ccc1adf
commit 9f97764
Show file tree

Hide file tree

Showing 83 changed files with 24 additions and 162 deletions.
diff --git a/boards/arc/em_starterkit/em_starterkit.dts b/boards/arc/em_starterkit/em_starterkit.dts
@@ -42,7 +42,3 @@
 	status = "okay";
 	current-speed = <115200>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/atsamd21_xpro/atsamd21_xpro.dts b/boards/arm/atsamd21_xpro/atsamd21_xpro.dts
@@ -106,7 +106,3 @@
 &usb0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl.dts b/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl.dts
@@ -98,7 +98,3 @@
 &rtc {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl.dts b/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl.dts
@@ -67,7 +67,3 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl.dts b/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl.dts
@@ -71,7 +71,3 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1.dts b/boards/arm/disco_l475_iot1/disco_l475_iot1.dts
@@ -228,7 +228,3 @@
 		     &adc1_in14_pc5>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a.dts b/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a.dts
@@ -189,7 +189,3 @@
 &trng0 {
 		status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/frdm_k64f/frdm_k64f.dts b/boards/arm/frdm_k64f/frdm_k64f.dts
@@ -228,7 +228,3 @@ arduino_spi: &spi0 {
 &pit0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts b/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts
@@ -74,7 +74,3 @@
 &flexcomm5 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures_m4.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts
@@ -99,7 +99,3 @@
 	dma-channels = <20>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853.dts b/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853.dts
@@ -141,7 +141,3 @@
 &tach0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
@@ -161,7 +161,3 @@ arduino_serial: &lpuart3 {};
 &wdog0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
@@ -158,7 +158,3 @@ arduino_serial: &lpuart3 {};
 &wdog0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts b/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts
@@ -133,7 +133,3 @@ arduino_spi: &flexcomm5 {
 &red_led {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures_cm33.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb.dts b/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb.dts
@@ -52,7 +52,3 @@
 &espi0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts
@@ -282,7 +282,3 @@ arduino_spi: &spi3 {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8.dts b/boards/arm/nucleo_f030r8/nucleo_f030r8.dts
@@ -86,7 +86,3 @@
 &iwdg {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f091rc/nucleo_f091rc.dts b/boards/arm/nucleo_f091rc/nucleo_f091rc.dts
@@ -107,7 +107,3 @@
 	status = "okay";
 	pinctrl-0 = <&dac_out1_pa4>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f207zg/nucleo_f207zg.dts b/boards/arm/nucleo_f207zg/nucleo_f207zg.dts
@@ -99,7 +99,3 @@
 	status = "okay";
 	pinctrl-0 = <&dac_out1_pa4>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f334r8/nucleo_f334r8.dts b/boards/arm/nucleo_f334r8/nucleo_f334r8.dts
@@ -102,7 +102,3 @@
 		};
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f401re/nucleo_f401re.dts b/boards/arm/nucleo_f401re/nucleo_f401re.dts
@@ -136,7 +136,3 @@
 &wwdg {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi.dts b/boards/arm/nucleo_f429zi/nucleo_f429zi.dts
@@ -164,7 +164,3 @@
 
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_f746zg/nucleo_f746zg.dts b/boards/arm/nucleo_f746zg/nucleo_f746zg.dts
@@ -144,7 +144,3 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_g071rb/nucleo_g071rb.dts b/boards/arm/nucleo_g071rb/nucleo_g071rb.dts
@@ -72,7 +72,3 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_g474re/nucleo_g474re.dts b/boards/arm/nucleo_g474re/nucleo_g474re.dts
@@ -130,7 +130,3 @@
 	pinctrl-0 = <&adc1_in1_pa0>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_l053r8/nucleo_l053r8.dts b/boards/arm/nucleo_l053r8/nucleo_l053r8.dts
@@ -73,7 +73,3 @@
 &eeprom {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_l073rz/nucleo_l073rz.dts b/boards/arm/nucleo_l073rz/nucleo_l073rz.dts
@@ -77,7 +77,3 @@
 	status = "okay";
 	pinctrl-0 = <&dac_out1_pa4>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_l152re/nucleo_l152re.dts b/boards/arm/nucleo_l152re/nucleo_l152re.dts
@@ -75,7 +75,3 @@
 	status = "okay";
 	pinctrl-0 = <&dac_out1_pa4>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_l476rg/nucleo_l476rg.dts b/boards/arm/nucleo_l476rg/nucleo_l476rg.dts
@@ -108,7 +108,3 @@
 	pinctrl-0 = <&adc1_in1_pc0>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts
@@ -143,7 +143,3 @@
 	pinctrl-0 = <&adc1_in1_pc0>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/nucleo_wb55rg/nucleo_wb55rg.dts b/boards/arm/nucleo_wb55rg/nucleo_wb55rg.dts
@@ -159,7 +159,3 @@
 
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/stm32f3_disco/stm32f3_disco.dts b/boards/arm/stm32f3_disco/stm32f3_disco.dts
@@ -166,7 +166,3 @@
 	pinctrl-0 = <&adc1_in1_pa0>;
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m7.dts b/boards/arm/stm32h747i_disco/stm32h747i_disco_m7.dts
@@ -127,7 +127,3 @@
 		};
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures_m7.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2.dts b/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2.dts
@@ -86,7 +86,3 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts b/boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts
@@ -220,7 +220,3 @@
 		};
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts b/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts
@@ -79,7 +79,3 @@
 &epit2 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/riscv/hifive1_revb/hifive1_revb.dts b/boards/riscv/hifive1_revb/hifive1_revb.dts
@@ -130,7 +130,3 @@ arduino_i2c: &i2c0 {
 	input-frequency = <16000000>;
 	clock-frequency = <100000>;
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy.dts b/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy.dts
@@ -54,7 +54,3 @@
 		};
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures_ri5cy.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/x86/up_squared/up_squared.dts b/boards/x86/up_squared/up_squared.dts
@@ -25,7 +25,3 @@
 		zephyr,bt-mon-uart = &uart1;
 	};
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/xtensa/esp32/esp32.dts b/boards/xtensa/esp32/esp32.dts
@@ -74,7 +74,3 @@
 &trng0 {
 	status = "okay";
 };
-
-#ifdef DTS_INCLUDE_FIXTURES
-#include "fixtures.dtsi"
-#endif /* DTS_INCLUDE_FIXTURES */
diff --git a/boards/arm/atsamd21_xpro/fixtures.dtsi → tests/common/boards/atsamd21_xpro.overlay b/boards/arm/atsamd21_xpro/fixtures.dtsi → tests/common/boards/atsamd21_xpro.overlay
diff --git a/boards/arm/cc1352r1_launchxl/fixtures.dtsi → ...s/common/boards/cc1352r1_launchxl.overlay b/boards/arm/cc1352r1_launchxl/fixtures.dtsi → ...s/common/boards/cc1352r1_launchxl.overlay
diff --git a/boards/arm/cc3220sf_launchxl/fixtures.dtsi → ...s/common/boards/cc3220sf_launchxl.overlay b/boards/arm/cc3220sf_launchxl/fixtures.dtsi → ...s/common/boards/cc3220sf_launchxl.overlay
diff --git a/boards/arm/cc3235sf_launchxl/fixtures.dtsi → ...s/common/boards/cc3235sf_launchxl.overlay b/boards/arm/cc3235sf_launchxl/fixtures.dtsi → ...s/common/boards/cc3235sf_launchxl.overlay
diff --git a/boards/arm/disco_l475_iot1/fixtures.dtsi → tests/common/boards/disco_l475_iot1.overlay b/boards/arm/disco_l475_iot1/fixtures.dtsi → tests/common/boards/disco_l475_iot1.overlay
diff --git a/boards/arm/efr32mg_sltb004a/fixtures.dtsi → tests/common/boards/efr32mg_sltb004a.overlay b/boards/arm/efr32mg_sltb004a/fixtures.dtsi → tests/common/boards/efr32mg_sltb004a.overlay
diff --git a/boards/arc/em_starterkit/fixtures.dtsi → tests/common/boards/em_starterkit.overlay b/boards/arc/em_starterkit/fixtures.dtsi → tests/common/boards/em_starterkit.overlay
diff --git a/boards/xtensa/esp32/fixtures.dtsi → tests/common/boards/esp32.overlay b/boards/xtensa/esp32/fixtures.dtsi → tests/common/boards/esp32.overlay
diff --git a/boards/arm/frdm_k64f/fixtures.dtsi → tests/common/boards/frdm_k64f.overlay b/boards/arm/frdm_k64f/fixtures.dtsi → tests/common/boards/frdm_k64f.overlay
diff --git a/boards/arm/nucleo_l152re/fixtures.dtsi → tests/common/boards/hifive1_revb.overlay b/boards/arm/nucleo_l152re/fixtures.dtsi → tests/common/boards/hifive1_revb.overlay
diff --git a/boards/arm/lpcxpresso54114/fixtures_m4.dtsi → .../common/boards/lpcxpresso54114_m4.overlay b/boards/arm/lpcxpresso54114/fixtures_m4.dtsi → .../common/boards/lpcxpresso54114_m4.overlay
diff --git a/boards/arm/lpcxpresso55s69/fixtures.dtsi → ...ommon/boards/lpcxpresso55s69_cpu0.overlay b/boards/arm/lpcxpresso55s69/fixtures.dtsi → ...ommon/boards/lpcxpresso55s69_cpu0.overlay
diff --git a/boards/arm/mec15xxevb_assy6853/fixtures.dtsi → ...common/boards/mec15xxevb_assy6853.overlay b/boards/arm/mec15xxevb_assy6853/fixtures.dtsi → ...common/boards/mec15xxevb_assy6853.overlay
diff --git a/boards/arm/mimxrt1050_evk/fixtures.dtsi → tests/common/boards/mimxrt1050_evk.overlay b/boards/arm/mimxrt1050_evk/fixtures.dtsi → tests/common/boards/mimxrt1050_evk.overlay
diff --git a/boards/arm/mimxrt1060_evk/fixtures.dtsi → tests/common/boards/mimxrt1060_evk.overlay b/boards/arm/mimxrt1060_evk/fixtures.dtsi → tests/common/boards/mimxrt1060_evk.overlay
diff --git a/boards/arm/mimxrt685_evk/fixtures_cm33.dtsi → .../common/boards/mimxrt685_evk_cm33.overlay b/boards/arm/mimxrt685_evk/fixtures_cm33.dtsi → .../common/boards/mimxrt685_evk_cm33.overlay
diff --git a/boards/arm/npcx7m6fb_evb/fixtures.dtsi → tests/common/boards/npcx7m6fb_evb.overlay b/boards/arm/npcx7m6fb_evb/fixtures.dtsi → tests/common/boards/npcx7m6fb_evb.overlay
diff --git a/boards/arm/nrf52840dk_nrf52840/fixtures.dtsi → ...common/boards/nrf52840dk_nrf52840.overlay b/boards/arm/nrf52840dk_nrf52840/fixtures.dtsi → ...common/boards/nrf52840dk_nrf52840.overlay
diff --git a/boards/arm/nucleo_f030r8/fixtures.dtsi → tests/common/boards/nucleo_f030r8.overlay b/boards/arm/nucleo_f030r8/fixtures.dtsi → tests/common/boards/nucleo_f030r8.overlay
diff --git a/boards/arm/nucleo_f091rc/fixtures.dtsi → tests/common/boards/nucleo_f091rc.overlay b/boards/arm/nucleo_f091rc/fixtures.dtsi → tests/common/boards/nucleo_f091rc.overlay
diff --git a/boards/arm/nucleo_f207zg/fixtures.dtsi → tests/common/boards/nucleo_f207zg.overlay b/boards/arm/nucleo_f207zg/fixtures.dtsi → tests/common/boards/nucleo_f207zg.overlay
diff --git a/boards/arm/nucleo_f334r8/fixtures.dtsi → tests/common/boards/nucleo_f334r8.overlay b/boards/arm/nucleo_f334r8/fixtures.dtsi → tests/common/boards/nucleo_f334r8.overlay
diff --git a/boards/arm/nucleo_f401re/fixtures.dtsi → tests/common/boards/nucleo_f401re.overlay b/boards/arm/nucleo_f401re/fixtures.dtsi → tests/common/boards/nucleo_f401re.overlay
diff --git a/boards/arm/nucleo_f429zi/fixtures.dtsi → tests/common/boards/nucleo_f429zi.overlay b/boards/arm/nucleo_f429zi/fixtures.dtsi → tests/common/boards/nucleo_f429zi.overlay
diff --git a/boards/arm/nucleo_f746zg/fixtures.dtsi → tests/common/boards/nucleo_f746zg.overlay b/boards/arm/nucleo_f746zg/fixtures.dtsi → tests/common/boards/nucleo_f746zg.overlay
diff --git a/boards/arm/nucleo_g071rb/fixtures.dtsi → tests/common/boards/nucleo_g071rb.overlay b/boards/arm/nucleo_g071rb/fixtures.dtsi → tests/common/boards/nucleo_g071rb.overlay
diff --git a/boards/arm/nucleo_g474re/fixtures.dtsi → tests/common/boards/nucleo_g474re.overlay b/boards/arm/nucleo_g474re/fixtures.dtsi → tests/common/boards/nucleo_g474re.overlay
diff --git a/boards/arm/nucleo_l053r8/fixtures.dtsi → tests/common/boards/nucleo_l053r8.overlay b/boards/arm/nucleo_l053r8/fixtures.dtsi → tests/common/boards/nucleo_l053r8.overlay
diff --git a/boards/arm/nucleo_l073rz/fixtures.dtsi → tests/common/boards/nucleo_l073rz.overlay b/boards/arm/nucleo_l073rz/fixtures.dtsi → tests/common/boards/nucleo_l073rz.overlay
diff --git a/boards/riscv/hifive1_revb/fixtures.dtsi → tests/common/boards/nucleo_l152re.overlay b/boards/riscv/hifive1_revb/fixtures.dtsi → tests/common/boards/nucleo_l152re.overlay
diff --git a/boards/arm/nucleo_l476rg/fixtures.dtsi → tests/common/boards/nucleo_l476rg.overlay b/boards/arm/nucleo_l476rg/fixtures.dtsi → tests/common/boards/nucleo_l476rg.overlay
diff --git a/boards/arm/nucleo_l4r5zi/fixtures.dtsi → tests/common/boards/nucleo_l4r5zi.overlay b/boards/arm/nucleo_l4r5zi/fixtures.dtsi → tests/common/boards/nucleo_l4r5zi.overlay
diff --git a/boards/arm/nucleo_wb55rg/fixtures.dtsi → tests/common/boards/nucleo_wb55rg.overlay b/boards/arm/nucleo_wb55rg/fixtures.dtsi → tests/common/boards/nucleo_wb55rg.overlay
diff --git a/boards/riscv/rv32m1_vega/fixtures_ri5cy.dtsi → ...s/common/boards/rv32m1_vega_ri5cy.overlay b/boards/riscv/rv32m1_vega/fixtures_ri5cy.dtsi → ...s/common/boards/rv32m1_vega_ri5cy.overlay
diff --git a/boards/arm/sam_e70_xplained/fixtures.dtsi → tests/common/boards/sam_e70_xplained.overlay b/boards/arm/sam_e70_xplained/fixtures.dtsi → tests/common/boards/sam_e70_xplained.overlay
diff --git a/tests/common/boards/sam_e70b_xplained.overlay b/tests/common/boards/sam_e70b_xplained.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,fixture {
+		gpio-loopback {
+			compatible = "zephyr,fixture,gpio-loopback";
+			out-gpios = <&piod 21 0>;
+			in-gpios = <&piod 20 0>;
+		};
+	};
+};
diff --git a/boards/arm/stm32f3_disco/fixtures.dtsi → tests/common/boards/stm32f3_disco.overlay b/boards/arm/stm32f3_disco/fixtures.dtsi → tests/common/boards/stm32f3_disco.overlay
diff --git a/boards/arm/stm32h747i_disco/fixtures_m7.dtsi → ...common/boards/stm32h747i_disco_m7.overlay b/boards/arm/stm32h747i_disco/fixtures_m7.dtsi → ...common/boards/stm32h747i_disco_m7.overlay
diff --git a/boards/arm/stm32mp157c_dk2/fixtures.dtsi → tests/common/boards/stm32mp157c_dk2.overlay b/boards/arm/stm32mp157c_dk2/fixtures.dtsi → tests/common/boards/stm32mp157c_dk2.overlay
diff --git a/boards/arm/thingy52_nrf52832/fixtures.dtsi → ...s/common/boards/thingy52_nrf52832.overlay b/boards/arm/thingy52_nrf52832/fixtures.dtsi → ...s/common/boards/thingy52_nrf52832.overlay
diff --git a/boards/arm/udoo_neo_full_m4/fixtures.dtsi → tests/common/boards/udoo_neo_full_m4.overlay b/boards/arm/udoo_neo_full_m4/fixtures.dtsi → tests/common/boards/udoo_neo_full_m4.overlay
diff --git a/boards/x86/up_squared/fixtures.dtsi → tests/common/boards/up_squared.overlay b/boards/x86/up_squared/fixtures.dtsi → tests/common/boards/up_squared.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/CMakeLists.txt b/tests/drivers/gpio/gpio_basic_api/CMakeLists.txt
@@ -2,8 +2,15 @@
 
 cmake_minimum_required(VERSION 3.13.1)
 
-# This test requires devicetree fixture support
-set(DTS_EXTRA_CPPFLAGS "-DDTS_INCLUDE_FIXTURES")
+# This manually adds a DTC overlay file if such exists in
+# tests/common/gpio-fixture/boards for the board.
+# This breaks what is documented regarding inclusion of overlay files:
+# https://docs.zephyrproject.org/latest/guides/dts/howtos.html#set-devicetree-overlays
+# so in case this approach is taken, it should be documented properly.
+# As long as this principle is only used under tests/ it is acceptable.
+zephyr_file(CONF_FILES ${ZEPHYR_BASE}/tests/common/gpio-fixture/boards
+            DTS        DTC_OVERLAY_FILE
+)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(gpio_basic_api)