From 6962218a4bb819a64750f54b8cee4862806a0e88 Mon Sep 17 00:00:00 2001 From: Ondrej Kosta Date: Mon, 27 Jun 2022 11:19:05 +0200 Subject: [PATCH 1/2] Copyright check config: made more specific to not overwrite allowed licenses --- tools/ci/check_copyright_config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index f9e50dd07e..62676b4029 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -83,7 +83,8 @@ freertos_component: ethernet_component: include: - - 'components/esp_eth/**' + - 'components/esp_eth/include/**' + - 'components/esp_eth/src/**' allowed_licenses: - Apache-2.0 - MIT # To allow contributed drivers From 08f421a09198eadd6b459484622dbf59dbb959f4 Mon Sep 17 00:00:00 2001 From: Ondrej Kosta Date: Thu, 23 Jun 2022 17:23:58 +0200 Subject: [PATCH 2/2] esp_eth: pytest_esp_eth CI timeout hotfix --- components/esp_eth/test_apps/pytest_esp_eth.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/esp_eth/test_apps/pytest_esp_eth.py b/components/esp_eth/test_apps/pytest_esp_eth.py index 6f9440d505..aba0ead6cf 100644 --- a/components/esp_eth/test_apps/pytest_esp_eth.py +++ b/components/esp_eth/test_apps/pytest_esp_eth.py @@ -133,7 +133,9 @@ def actual_test(dut: Dut) -> None: recv_resp_poke(rx_i) finally: pipe_send.send(0) - tx_proc.join() + tx_proc.join(5) + if tx_proc.exitcode is None: + tx_proc.terminate() dut.expect_unity_test_output()