From a62e10310957b64cbd64a4243ee1f11f4e704f96 Mon Sep 17 00:00:00 2001 From: Chen Yudong Date: Wed, 21 Dec 2022 12:07:35 +0800 Subject: [PATCH] CI: add example adc tests --- .gitlab/ci/rules.yml | 127 ++++++++++++++---- .gitlab/ci/target-test.yml | 40 ++++++ .../continuous_read/pytest_adc_continuous.py | 1 + .../adc/oneshot_read/pytest_adc_oneshot.py | 18 ++- .../oneshot_read/sdkconfig.ci.esp32c2_xtal26m | 2 + 5 files changed, 162 insertions(+), 26 deletions(-) create mode 100644 examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 2627a72cf1..df3515137a 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -239,13 +239,14 @@ - "components/hal/esp32s*/include/hal/usb*.h" - "components/usb/**/*" -# for jobs: component_ut_pytest_esp32x_adc: -.patterns-component_ut-adc: &patterns-component_ut-adc +# for jobs: *_pytest_esp32x_adc: +.patterns-target_test-adc: &patterns-target_test-adc - "components/esp_adc/**/*" - "components/driver/**/*" - "components/hal/**/*" - "components/esp_hw_support/**/*" - "components/efuse/**/*" + - "examples/peripherals/adc/**/*" ############## @@ -531,10 +532,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -556,10 +557,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -580,10 +581,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -604,10 +605,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -628,10 +629,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -652,10 +653,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -676,10 +677,10 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -704,6 +705,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -723,6 +726,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -741,6 +746,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -759,6 +766,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -777,6 +786,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -795,6 +806,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -813,6 +826,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -858,6 +873,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -888,6 +905,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -916,6 +935,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -945,6 +966,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -973,6 +996,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1001,6 +1026,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1029,6 +1056,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1114,8 +1143,6 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push @@ -1134,6 +1161,8 @@ changes: *patterns-integration_test-ble - <<: *if-dev-push changes: *patterns-integration_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1160,6 +1189,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1181,6 +1212,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1201,6 +1234,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1221,6 +1256,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1241,6 +1278,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1261,6 +1300,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1281,6 +1322,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi - <<: *if-dev-push @@ -1358,7 +1401,7 @@ - <<: *if-label-component_ut_esp32 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32-bt: rules: @@ -1445,7 +1488,7 @@ - <<: *if-label-component_ut_esp32c2 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32c2-bt: rules: @@ -1532,7 +1575,7 @@ - <<: *if-label-component_ut_esp32c3 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32c3-bt: rules: @@ -1619,7 +1662,7 @@ - <<: *if-label-component_ut_esp32h2 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32h2-bt: rules: @@ -1706,7 +1749,7 @@ - <<: *if-label-component_ut_esp32s2 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32s2-bt: rules: @@ -1793,7 +1836,7 @@ - <<: *if-label-component_ut_esp32s3 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32s3-bt: rules: @@ -1877,6 +1920,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32-bt: rules: @@ -1958,6 +2003,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32c2-bt: rules: @@ -2039,6 +2086,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32c3 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32c3-bt: rules: @@ -2120,6 +2169,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32h2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32h2-bt: rules: @@ -2201,6 +2252,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32s2-bt: rules: @@ -2282,6 +2335,8 @@ - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32s3 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:custom_test-esp32s3-bt: rules: @@ -2365,6 +2420,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32-bt: rules: @@ -2465,6 +2522,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32c2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32c2-bt: rules: @@ -2556,6 +2615,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32c3 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32c3-bt: rules: @@ -2656,6 +2717,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32h2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32h2-bt: rules: @@ -2747,6 +2810,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32s2 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32s2-bt: rules: @@ -2838,6 +2903,8 @@ - <<: *if-label-example_test - <<: *if-label-example_test_esp32s3 - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:example_test-esp32s3-bt: rules: @@ -2995,6 +3062,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32-bt: rules: @@ -3078,6 +3147,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32c2-bt: rules: @@ -3161,6 +3232,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32c3 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32c3-bt: rules: @@ -3244,6 +3317,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32h2 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32h2-bt: rules: @@ -3327,6 +3402,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s2 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32s2-bt: rules: @@ -3410,6 +3487,8 @@ - <<: *if-label-target_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32s3 + - <<: *if-dev-push + changes: *patterns-target_test-adc .rules:test:unit_test-esp32s3-bt: rules: diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 503ed640f6..3efc70e699 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -239,6 +239,46 @@ example_test_pytest_esp32_extflash: - build_pytest_examples_esp32 tags: [ esp32, external_flash ] +example_test_pytest_esp32_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32-adc + needs: + - build_pytest_examples_esp32 + tags: [ esp32, adc ] + +example_test_pytest_esp32s2_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32s2-adc + needs: + - build_pytest_examples_esp32s2 + tags: [ esp32s2, adc ] + +example_test_pytest_esp32s3_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32s3-adc + needs: + - build_pytest_examples_esp32s3 + tags: [ esp32s3, adc ] + +example_test_pytest_esp32c3_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c3-adc + needs: + - build_pytest_examples_esp32c3 + tags: [ esp32c3, adc ] + +example_test_pytest_esp32c2_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c2-adc + needs: + - build_pytest_examples_esp32c2 + tags: [ esp32c2, adc, xtal_26mhz] + .pytest_components_dir_template: extends: .pytest_template variables: diff --git a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py index 92fd226664..c4156a7865 100644 --- a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py +++ b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py @@ -9,6 +9,7 @@ from pytest_embedded.dut import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.adc def test_adc_continuous(dut: Dut) -> None: res = dut.expect(r'TASK: ret is 0, ret_num is (\d+)') num = res.group(1).decode('utf8') diff --git a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py index 562a3a800d..8f2c266e99 100644 --- a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py +++ b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py @@ -9,6 +9,20 @@ from pytest_embedded.dut import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 -@pytest.mark.esp32c2 +@pytest.mark.adc def test_adc_oneshot(dut: Dut) -> None: - dut.expect(r'ADC_ONESHOT: ADC1 Channel\[(\d+)]\ Raw Data: (\d+)', timeout=5) + dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5) + + +@pytest.mark.esp32c2 +@pytest.mark.adc +@pytest.mark.xtal_26mhz +@pytest.mark.parametrize( + 'config, baud', + [ + ('esp32c2_xtal26m', '74880'), + ], + indirect=True, +) +def test_adc_oneshot_esp32c2_xtal_26mhz(dut: Dut) -> None: + dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5) diff --git a/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m b/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m new file mode 100644 index 0000000000..172f022b67 --- /dev/null +++ b/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32c2" +CONFIG_XTAL_FREQ_26=y