diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 595226634..c773101fb 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -69,11 +69,13 @@ TEST_RUN_DIR: "build_test_app_${CHIP_NAME}" IDF_RELEASE_TAG: "latest" TEST_RUN_RETRY: "" # Dont retry + ESP_GCOV_TOOLCHAIN: "${ESP_V5_5X_XTENSA_GCOV_TOOLCHAIN}-arm-linux-gnueabihf" .tests_arm64_master_template: extends: .tests_armhf_master_template variables: PLATFORM_NAME: "linux-arm64-test" + ESP_GCOV_TOOLCHAIN: "${ESP_V5_5X_XTENSA_GCOV_TOOLCHAIN}-aarch64-linux-gnu" .tests_armhf_master_riscv_template: extends: .tests_armhf_master_template @@ -81,11 +83,13 @@ CHIP_TEST_TOOLCHAIN: "riscv32-esp" ESP_GDB_TOOLCHAIN: "${ESP_V5_5X_RISCV_GDB_TOOLCHAIN}" TOOLCHAIN_PREFIX: "riscv32-esp" + ESP_GCOV_TOOLCHAIN: "${ESP_V5_5X_RISCV_GCOV_TOOLCHAIN}-arm-linux-gnueabihf" .tests_arm64_master_riscv_template: extends: .tests_armhf_master_riscv_template variables: PLATFORM_NAME: "linux-arm64-test" + ESP_GCOV_TOOLCHAIN: "${ESP_V5_5X_RISCV_GCOV_TOOLCHAIN}-aarch64-linux-gnu" .tests_armhf_v5.4.x_template: extends: .tests_armhf_template diff --git a/.gitlab/ci/util.yml b/.gitlab/ci/util.yml index d940bcb21..21bc9a860 100644 --- a/.gitlab/ci/util.yml +++ b/.gitlab/ci/util.yml @@ -22,6 +22,11 @@ if [ ! -z "$ESP_GDB_TOOLCHAIN" ]; then export PATH=${HOME}/.espressif/tools/${ESP_GDB_TOOLCHAIN}/bin:${PATH} fi + if [ ! -z "$ESP_GCOV_TOOLCHAIN" ]; then + wget --no-cache --no-verbose https://dl.espressif.com/dl/${ESP_TOOLCHAIN}-gcov.tar.gz + tar -xvf ${ESP_TOOLCHAIN}-gcov.tar.gz + export PATH=${ESP_GCOV_TOOLCHAIN}/${TOOLCHAIN_PREFIX}-elf/bin:${PATH} + fi .export_toolchain: script: - *export_toolchain_snippet