diff --git a/.github/workflows/mdns__build-target-test.yml b/.github/workflows/mdns__build-target-test.yml index 868256a76..eca051d69 100644 --- a/.github/workflows/mdns__build-target-test.yml +++ b/.github/workflows/mdns__build-target-test.yml @@ -26,7 +26,7 @@ jobs: . ${IDF_PATH}/export.sh python -m pip install idf-build-apps # Build default configs for all targets - python ./ci/build_apps.py components/mdns/${{ matrix.test.path }} -r default -m components/mdns/.build-test-rules.yml -d + python ./ci/build_apps.py components/mdns/${{ matrix.test.path }} -r default -d # Build specific configs for test targets python ./ci/build_apps.py components/mdns/${{ matrix.test.path }} cd components/mdns/${{ matrix.test.path }} diff --git a/components/mdns/.build-test-rules.yml b/components/mdns/.build-test-rules.yml deleted file mode 100644 index 9a4da23d2..000000000 --- a/components/mdns/.build-test-rules.yml +++ /dev/null @@ -1,11 +0,0 @@ -components/mdns/examples: - disable: - - if: IDF_TARGET in ["esp32h2"] - -components/mdns/tests/unit_test: - disable: - - if: IDF_TARGET in ["esp32h2"] - -components/mdns/tests/test_apps: - disable: - - if: IDF_TARGET in ["esp32h2"] diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c index cef1416d5..cfeb6f5ab 100644 --- a/components/mdns/mdns.c +++ b/components/mdns/mdns.c @@ -5386,13 +5386,13 @@ static inline void set_default_duplicated_interfaces(void) static inline void unregister_predefined_handlers(void) { -#if defined(MDNS_ESP_WIFI_ENABLED) && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP) +#if MDNS_ESP_WIFI_ENABLED && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP) esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event); #endif #if CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP || CONFIG_MDNS_PREDEF_NETIF_ETH esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event); #endif -#if defined(CONFIG_ETH_ENABLED) && CONFIG_MDNS_PREDEF_NETIF_ETH +#if CONFIG_ETH_ENABLED && CONFIG_MDNS_PREDEF_NETIF_ETH esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event); #endif } @@ -5483,7 +5483,7 @@ esp_err_t mdns_init(void) goto free_queue; } -#if defined(MDNS_ESP_WIFI_ENABLED) && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP) +#if MDNS_ESP_WIFI_ENABLED && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP) if ((err = esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event, NULL)) != ESP_OK) { goto free_event_handlers; } @@ -5493,7 +5493,7 @@ esp_err_t mdns_init(void) goto free_event_handlers; } #endif -#if defined(CONFIG_ETH_ENABLED) && CONFIG_MDNS_PREDEF_NETIF_ETH +#if CONFIG_ETH_ENABLED && CONFIG_MDNS_PREDEF_NETIF_ETH if ((err = esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event, NULL)) != ESP_OK) { goto free_event_handlers; }