Unify skip and only logic for build scripts

And switch to a single file that can include mcu, family or board.
2022-01-05 15:44:23 -08:00
parent 4fe0a30ec7
commit 7b27b8f498
85 changed files with 136 additions and 82 deletions
--- a/examples/device/audio_4_channel_mic/.skip.MCU_SAMD11
+++ b/examples/device/audio_4_channel_mic/.skip.MCU_SAMD11
--- a/examples/device/audio_4_channel_mic/.skip.MCU_SAME5X
+++ b/examples/device/audio_4_channel_mic/.skip.MCU_SAME5X
--- a/examples/device/audio_4_channel_mic/.skip.MCU_SAMG
+++ b/examples/device/audio_4_channel_mic/.skip.MCU_SAMG
--- a/examples/device/audio_4_channel_mic/skip.txt
+++ b/examples/device/audio_4_channel_mic/skip.txt
@@ -0,0 +1,3 @@
+mcu:SAMD11
+mcu:SAME5X
+mcu:SAMG
--- a/examples/device/audio_test/.skip.MCU_SAMD11
+++ b/examples/device/audio_test/.skip.MCU_SAMD11
--- a/examples/device/audio_test/.skip.MCU_SAME5X
+++ b/examples/device/audio_test/.skip.MCU_SAME5X
--- a/examples/device/audio_test/.skip.MCU_SAMG
+++ b/examples/device/audio_test/.skip.MCU_SAMG
--- a/examples/device/audio_test/skip.txt
+++ b/examples/device/audio_test/skip.txt
@@ -0,0 +1,3 @@
+mcu:SAMD11
+mcu:SAME5X
+mcu:SAMG
--- a/examples/device/cdc_msc/.skip.MCU_SAMD11
+++ b/examples/device/cdc_msc/.skip.MCU_SAMD11
--- a/examples/device/cdc_msc/skip.txt
+++ b/examples/device/cdc_msc/skip.txt
@@ -0,0 +1 @@
+mcu:SAMD11
--- a/examples/device/cdc_msc_freertos/.skip.MCU_BCM2711
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_BCM2711
--- a/examples/device/cdc_msc_freertos/.skip.MCU_BCM2835
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_BCM2835
--- a/examples/device/cdc_msc_freertos/.skip.MCU_BCM2837
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_BCM2837
--- a/examples/device/cdc_msc_freertos/.skip.MCU_CXD56
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_CXD56
--- a/examples/device/cdc_msc_freertos/.skip.MCU_GD32VF103
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_GD32VF103
--- a/examples/device/cdc_msc_freertos/.skip.MCU_MKL25ZXX
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_MKL25ZXX
--- a/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx
--- a/examples/device/cdc_msc_freertos/.skip.MCU_RP2040
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_RP2040
--- a/examples/device/cdc_msc_freertos/.skip.MCU_SAMD11
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_SAMD11
--- a/examples/device/cdc_msc_freertos/.skip.MCU_SAMX7X
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_SAMX7X
--- a/examples/device/cdc_msc_freertos/.skip.MCU_VALENTYUSB_EPTRI
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_VALENTYUSB_EPTRI
--- a/examples/device/cdc_msc_freertos/skip.txt
+++ b/examples/device/cdc_msc_freertos/skip.txt
@@ -0,0 +1,10 @@
+mcu:CXD56
+mcu:MSP430x5xx
+mcu:SAMD11
+mcu:VALENTYUSB_EPTRI
+mcu:MKL25ZXX
+mcu:RP2040
+mcu:SAMX7X
+mcu:GD32VF103
+family:broadcom_64bit
+family:broadcom_32bit
--- a/examples/device/dfu/.skip.MCU_TM4C123
+++ b/examples/device/dfu/.skip.MCU_TM4C123
@@ -1,4 +0,0 @@
-LINK _build/ek-tm4c123gxl/dfu.elf
-/home/runner/cache/toolchain/xpack-arm-none-eabi-gcc-10.2.1-1.1/bin/../lib/gcc/arm-none-eabi/10.2.1/../../../../arm-none-eabi/bin/ld: section .ARM.exidx.text._close LMA [0000000000002980,0000000000002987] overlaps section .data LMA [0000000000002980,0000000000002a03]
-collect2: error: ld returned 1 exit status
-make: *** [../../rules.mk:94: _build/ek-tm4c123gxl/dfu.elf] Error 1
--- a/examples/device/dfu/skip.txt
+++ b/examples/device/dfu/skip.txt
@@ -0,0 +1 @@
+mcu:TM4C123
--- a/examples/device/dynamic_configuration/.skip.MCU_SAMD11
+++ b/examples/device/dynamic_configuration/.skip.MCU_SAMD11
--- a/examples/device/dynamic_configuration/skip.txt
+++ b/examples/device/dynamic_configuration/skip.txt
@@ -0,0 +1 @@
+mcu:SAMD11
--- a/examples/device/hid_composite_freertos/.skip.MCU_BCM2711
+++ b/examples/device/hid_composite_freertos/.skip.MCU_BCM2711
--- a/examples/device/hid_composite_freertos/.skip.MCU_BCM2835
+++ b/examples/device/hid_composite_freertos/.skip.MCU_BCM2835
--- a/examples/device/hid_composite_freertos/.skip.MCU_BCM2837
+++ b/examples/device/hid_composite_freertos/.skip.MCU_BCM2837
--- a/examples/device/hid_composite_freertos/.skip.MCU_CXD56
+++ b/examples/device/hid_composite_freertos/.skip.MCU_CXD56
--- a/examples/device/hid_composite_freertos/.skip.MCU_GD32VF103
+++ b/examples/device/hid_composite_freertos/.skip.MCU_GD32VF103
--- a/examples/device/hid_composite_freertos/.skip.MCU_MSP430x5xx
+++ b/examples/device/hid_composite_freertos/.skip.MCU_MSP430x5xx
--- a/examples/device/hid_composite_freertos/.skip.MCU_RP2040
+++ b/examples/device/hid_composite_freertos/.skip.MCU_RP2040
--- a/examples/device/hid_composite_freertos/.skip.MCU_SAMD11
+++ b/examples/device/hid_composite_freertos/.skip.MCU_SAMD11
--- a/examples/device/hid_composite_freertos/.skip.MCU_SAMX7X
+++ b/examples/device/hid_composite_freertos/.skip.MCU_SAMX7X
--- a/examples/device/hid_composite_freertos/.skip.MCU_VALENTYUSB_EPTRI
+++ b/examples/device/hid_composite_freertos/.skip.MCU_VALENTYUSB_EPTRI
--- a/examples/device/hid_composite_freertos/skip.txt
+++ b/examples/device/hid_composite_freertos/skip.txt
@@ -0,0 +1,9 @@
+mcu:CXD56
+mcu:MSP430x5xx
+mcu:SAMD11
+mcu:VALENTYUSB_EPTRI
+mcu:RP2040
+mcu:SAMX7X
+mcu:GD32VF103
+family:broadcom_64bit
+family:broadcom_32bit
--- a/examples/device/msc_dual_lun/.skip.MCU_MKL25ZXX
+++ b/examples/device/msc_dual_lun/.skip.MCU_MKL25ZXX
--- a/examples/device/msc_dual_lun/.skip.MCU_SAMD11
+++ b/examples/device/msc_dual_lun/.skip.MCU_SAMD11
--- a/examples/device/msc_dual_lun/skip.txt
+++ b/examples/device/msc_dual_lun/skip.txt
@@ -0,0 +1,2 @@
+mcu:SAMD11
+mcu:MKL25ZXX
--- a/examples/device/net_lwip_webserver/.skip.MCU_BCM2711
+++ b/examples/device/net_lwip_webserver/.skip.MCU_BCM2711
@@ -1 +0,0 @@
-tinyusb/lib/lwip/src/include/lwip/arch.h:202:13: error: conflicting types for 'ssize_t'
--- a/examples/device/net_lwip_webserver/.skip.MCU_BCM2835
+++ b/examples/device/net_lwip_webserver/.skip.MCU_BCM2835
@@ -1 +0,0 @@
-tinyusb/lib/lwip/src/include/lwip/arch.h:202:13: error: conflicting types for 'ssize_t'
--- a/examples/device/net_lwip_webserver/.skip.MCU_BCM2837
+++ b/examples/device/net_lwip_webserver/.skip.MCU_BCM2837
@@ -1 +0,0 @@
-tinyusb/lib/lwip/src/include/lwip/arch.h:202:13: error: conflicting types for 'ssize_t'
--- a/examples/device/net_lwip_webserver/.skip.MCU_LPC11UXX
+++ b/examples/device/net_lwip_webserver/.skip.MCU_LPC11UXX
--- a/examples/device/net_lwip_webserver/.skip.MCU_LPC13XX
+++ b/examples/device/net_lwip_webserver/.skip.MCU_LPC13XX
--- a/examples/device/net_lwip_webserver/.skip.MCU_MKL25ZXX
+++ b/examples/device/net_lwip_webserver/.skip.MCU_MKL25ZXX
--- a/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx
+++ b/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx
@@ -1 +0,0 @@
-too many warnings for 16-bit integer overflow
--- a/examples/device/net_lwip_webserver/.skip.MCU_NUC121
+++ b/examples/device/net_lwip_webserver/.skip.MCU_NUC121
--- a/examples/device/net_lwip_webserver/.skip.MCU_SAMD11
+++ b/examples/device/net_lwip_webserver/.skip.MCU_SAMD11
--- a/examples/device/net_lwip_webserver/.skip.MCU_STM32L0
+++ b/examples/device/net_lwip_webserver/.skip.MCU_STM32L0
--- a/examples/device/net_lwip_webserver/skip.txt
+++ b/examples/device/net_lwip_webserver/skip.txt
@@ -0,0 +1,10 @@
+mcu:LPC11UXX
+mcu:LPC13XX
+mcu:MSP430x5xx
+mcu:NUC121
+mcu:SAMD11
+mcu:STM32L0
+mcu:MKL25ZXX
+family:broadcom_64bit
+family:broadcom_32bit
+board:curiosity_nano
--- a/examples/device/uac2_headset/.skip.MCU_LPC11UXX
+++ b/examples/device/uac2_headset/.skip.MCU_LPC11UXX
--- a/examples/device/uac2_headset/.skip.MCU_LPC13XX
+++ b/examples/device/uac2_headset/.skip.MCU_LPC13XX
--- a/examples/device/uac2_headset/.skip.MCU_NUC121
+++ b/examples/device/uac2_headset/.skip.MCU_NUC121
--- a/examples/device/uac2_headset/.skip.MCU_SAMD11
+++ b/examples/device/uac2_headset/.skip.MCU_SAMD11
--- a/examples/device/uac2_headset/.skip.MCU_SAME5X
+++ b/examples/device/uac2_headset/.skip.MCU_SAME5X
--- a/examples/device/uac2_headset/.skip.MCU_SAMG
+++ b/examples/device/uac2_headset/.skip.MCU_SAMG
--- a/examples/device/uac2_headset/skip.txt
+++ b/examples/device/uac2_headset/skip.txt
@@ -0,0 +1,6 @@
+mcu:LPC11UXX
+mcu:LPC13XX
+mcu:NUC121
+mcu:SAMD11
+mcu:SAME5X
+mcu:SAMG
--- a/examples/device/video_capture/.skip.MCU_MSP430x5xx
+++ b/examples/device/video_capture/.skip.MCU_MSP430x5xx
@@ -1 +0,0 @@
-too many warnings for 16-bit integer overflow
--- a/examples/device/video_capture/.skip.MCU_SAMD11
+++ b/examples/device/video_capture/.skip.MCU_SAMD11
--- a/examples/device/video_capture/skip.txt
+++ b/examples/device/video_capture/skip.txt
@@ -0,0 +1,2 @@
+mcu:MSP430x5xx
+mcu:SAMD11
--- a/examples/host/cdc_msc_hid/.only.MCU_LPC175X_6X
+++ b/examples/host/cdc_msc_hid/.only.MCU_LPC175X_6X
--- a/examples/host/cdc_msc_hid/.only.MCU_LPC177X_8X
+++ b/examples/host/cdc_msc_hid/.only.MCU_LPC177X_8X
--- a/examples/host/cdc_msc_hid/.only.MCU_LPC18XX
+++ b/examples/host/cdc_msc_hid/.only.MCU_LPC18XX
--- a/examples/host/cdc_msc_hid/.only.MCU_LPC40XX
+++ b/examples/host/cdc_msc_hid/.only.MCU_LPC40XX
--- a/examples/host/cdc_msc_hid/.only.MCU_LPC43XX
+++ b/examples/host/cdc_msc_hid/.only.MCU_LPC43XX
--- a/examples/host/cdc_msc_hid/.only.MCU_MIMXRT10XX
+++ b/examples/host/cdc_msc_hid/.only.MCU_MIMXRT10XX
--- a/examples/host/cdc_msc_hid/.only.MCU_MSP432E4
+++ b/examples/host/cdc_msc_hid/.only.MCU_MSP432E4
--- a/examples/host/cdc_msc_hid/.only.MCU_RP2040
+++ b/examples/host/cdc_msc_hid/.only.MCU_RP2040
--- a/examples/host/cdc_msc_hid/only.txt
+++ b/examples/host/cdc_msc_hid/only.txt
@@ -0,0 +1,8 @@
+mcu:LPC175X_6X
+mcu:LPC177X_8X
+mcu:LPC18XX
+mcu:LPC40XX
+mcu:LPC43XX
+mcu:MIMXRT10XX
+mcu:RP2040
+mcu:MSP432E4
--- a/examples/host/hid_controller/.only.MCU_LPC175X_6X
+++ b/examples/host/hid_controller/.only.MCU_LPC175X_6X
--- a/examples/host/hid_controller/.only.MCU_LPC177X_8X
+++ b/examples/host/hid_controller/.only.MCU_LPC177X_8X
--- a/examples/host/hid_controller/.only.MCU_LPC18XX
+++ b/examples/host/hid_controller/.only.MCU_LPC18XX
--- a/examples/host/hid_controller/.only.MCU_LPC40XX
+++ b/examples/host/hid_controller/.only.MCU_LPC40XX
--- a/examples/host/hid_controller/.only.MCU_LPC43XX
+++ b/examples/host/hid_controller/.only.MCU_LPC43XX
--- a/examples/host/hid_controller/.only.MCU_MIMXRT10XX
+++ b/examples/host/hid_controller/.only.MCU_MIMXRT10XX
--- a/examples/host/hid_controller/.only.MCU_MSP432E4
+++ b/examples/host/hid_controller/.only.MCU_MSP432E4
--- a/examples/host/hid_controller/.only.MCU_RP2040
+++ b/examples/host/hid_controller/.only.MCU_RP2040
--- a/examples/host/hid_controller/only.txt
+++ b/examples/host/hid_controller/only.txt
@@ -0,0 +1,8 @@
+mcu:LPC175X_6X
+mcu:LPC177X_8X
+mcu:LPC18XX
+mcu:LPC40XX
+mcu:LPC43XX
+mcu:MIMXRT10XX
+mcu:RP2040
+mcu:MSP432E4
				`@@ -1 +0,0 @@`
				`tinyusb/lib/lwip/src/include/lwip/arch.h:202:13: error: conflicting types for 'ssize_t'`
				`@@ -1 +0,0 @@`
				`too many warnings for 16-bit integer overflow`