CI: add generic to xtal_40mhz jobs

.gitlab/ci/target-test.yml

@@ -120,14 +120,6 @@ example_test_pytest_esp32c2_generic:
     - build_pytest_examples_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
-example_test_pytest_esp32c2_26mhz:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c2
-  needs:
-    - build_pytest_examples_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
-
 example_test_pytest_esp32c3_generic:
   extends:
     - .pytest_examples_dir_template
@@ -527,7 +519,7 @@ component_ut_pytest_esp32c2_adc:
     - .rules:test:component_ut-esp32c2-adc
   needs:
     - build_pytest_components_esp32c2
-  tags: [ esp32c2, adc ]
+  tags: [ esp32c2, adc, xtal_26mhz ]
 
 component_ut_pytest_esp32c2_generic_multi_device:
   extends:
@@ -543,7 +535,7 @@ component_ut_pytest_esp32c2_xtal_26mhz:
     - .rules:test:component_ut-esp32c2
   needs:
     - build_pytest_components_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
+  tags: [ esp32c2, generic, xtal_26mhz ]
 
 component_ut_pytest_esp32c3_generic:
   extends:
@@ -720,14 +712,6 @@ test_app_test_pytest_esp32c2_generic:
     - build_pytest_test_apps_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
-test_app_test_pytest_esp32c2_26mhz:
-  extends:
-    - .pytest_test_apps_dir_template
-    - .rules:test:custom_test-esp32c2
-  needs:
-    - build_pytest_test_apps_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
-
 test_app_test_pytest_esp32c3_generic:
   extends:
     - .pytest_test_apps_dir_template

components/driver/test_apps/gptimer/pytest_gptimer.py

@@ -23,6 +23,7 @@ def test_gptimer(dut: Dut) -> None:
 
 
 @pytest.mark.esp32c2
+@pytest.mark.generic
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',

components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py

@@ -23,9 +23,9 @@ def test_legacy_adc(dut: Dut) -> None:
     dut.expect_unity_test_output(timeout=240)
 
 
-# All ESP32C2 ADC runners are 26m xtal
 @pytest.mark.esp32c2
 @pytest.mark.adc
+@pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',
     [

components/esp_adc/test_apps/adc/pytest_adc.py

@@ -20,9 +20,9 @@ def test_adc(dut: Dut) -> None:
     dut.expect_unity_test_output(timeout=120)
 
 
-# All ESP32C2 ADC runners are 26m xtal
 @pytest.mark.esp32c2
 @pytest.mark.adc
+@pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',
     [

components/esp_timer/test_apps/pytest_esp_timer_ut.py

@@ -33,6 +33,7 @@ def test_esp_timer_psram(dut: Dut) -> None:
 
 
 @pytest.mark.esp32c2
+@pytest.mark.generic
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',