Skip to content

Commit 5c451a3

Browse files
committed
Merge branch 'bugfix/disable_app_test_for_idf_master' into 'master'
fix(test_apps): Fix test_apps compiling error for idf master branch See merge request espressif/esp-video-components!321
2 parents 5497fec + f2baa18 commit 5c451a3

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

.gitlab/ci/build.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,22 @@ build_test_esp32p4:
5050
matrix:
5151
- IMAGE: [espressif/idf:release-v5.4, espressif/idf:release-v5.5, espressif/idf:latest]
5252

53-
build_test_others:
53+
build_test_s3_c3_c6:
5454
extends:
5555
- .build_examples_template
5656
- .rules:build:test_apps
5757
variables:
58-
IDF_TARGETS: "esp32s3;esp32c3;esp32c5;esp32c6;esp32c61"
58+
IDF_TARGETS: "esp32s3;esp32c3;esp32c6"
5959
parallel:
6060
matrix:
6161
- IMAGE: [espressif/idf:release-v5.4, espressif/idf:release-v5.5, espressif/idf:latest]
62+
63+
build_test_c5_c61:
64+
extends:
65+
- .build_examples_template
66+
- .rules:build:test_apps
67+
variables:
68+
IDF_TARGETS: "esp32c5;esp32c61"
69+
parallel:
70+
matrix:
71+
- IMAGE: [espressif/idf:release-v5.5, espressif/idf:latest]

esp_video/test_apps/posix/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
# in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
5+
if (EXISTS "$ENV{IDF_PATH}/tools/unit-test-app/components")
6+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
7+
elseif (EXISTS "$ENV{IDF_PATH}/tools/test_apps/components")
8+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
9+
else()
10+
message(FATAL_ERROR "Could not find unit-test-app or test_apps components")
11+
endif()
612

713
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
814
project(test_apps_posix)

0 commit comments

Comments
 (0)