Skip to content

Commit 392226b

Browse files
committed
Merge branch 'feat/remove-catch-from-tools' into 'master'
feat(tools): Remove tools/catch Closes IDF-9203 See merge request espressif/esp-idf!40413
2 parents 661898c + 1798034 commit 392226b

36 files changed

+151
-10740
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ build_summary_*.xml
6666
coverage.info
6767
coverage_report/
6868

69-
test_multi_heap_host
70-
7169
# VS Code Settings
7270
.vscode/
7371

.gitlab/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@
215215
/tools/ @esp-idf-codeowners/tools
216216
/tools/ble/ @esp-idf-codeowners/app-utilities
217217
/tools/bt/ @esp-idf-codeowners/bluetooth
218-
/tools/catch/ @esp-idf-codeowners/ci
219218
/tools/ci/ @esp-idf-codeowners/ci
220219
/tools/cmake/ @esp-idf-codeowners/build-config
221220
/tools/cmake/toolchain-*.cmake @esp-idf-codeowners/toolchain

.gitlab/ci/host-test.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,12 @@ test_fatfsgen_on_host:
7777
- ./test_wl_fatfsgen.py
7878
- ./test_fatfsparse.py
7979

80-
test_multi_heap_on_host:
81-
extends: .host_test_template
82-
script:
83-
- cd components/heap/test_multi_heap_host
84-
- ./test_all_configs.sh
85-
8680
test_certificate_bundle_on_host:
8781
extends: .host_test_template
8882
script:
8983
- cd components/mbedtls/esp_crt_bundle/test_gen_crt_bundle/
9084
- ./test_gen_crt_bundle.py
9185

92-
test_gdbstub_on_host:
93-
extends: .host_test_template
94-
script:
95-
- cd components/esp_gdbstub/test_gdbstub_host
96-
- make test
97-
9886
# Test for create virtualenv. It must be invoked from Python, not from virtualenv.
9987
# Use docker image system python without any extra dependencies
10088
test_cli_installer:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
components/esp_gdbstub/test_gdbstub_host/rv_decode:
2+
enable:
3+
- if: IDF_TARGET == "linux"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
cmake_minimum_required(VERSION 3.22)
2+
3+
add_compile_options(-D__riscv_c)
4+
add_link_options(-D__riscv_c)
5+
6+
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
7+
set(COMPONENTS main)
8+
9+
# This test app doesn't require FreeRTOS, using mock instead
10+
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/")
11+
12+
project(rv_decode_test)

components/esp_gdbstub/test_gdbstub_host/rv_decode/Makefile

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| Supported Targets | Linux |
2+
| ----------------- | ----- |

components/esp_gdbstub/test_gdbstub_host/rv_decode/include/sdkconfig.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

components/esp_gdbstub/test_gdbstub_host/rv_decode/main.cpp

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
idf_component_register(SRCS
2+
"test_rv_decode.cpp"
3+
"../../../src/port/riscv/rv_decode.c"
4+
INCLUDE_DIRS
5+
"../../../private_include"
6+
"../../../include"
7+
"../../../src/port/riscv/include"
8+
"../../../../esp_hw_support/include"
9+
"../../../../soc/esp32c3/include"
10+
"../../../../esp_common/include"
11+
"../../../../riscv/include"
12+
WHOLE_ARCHIVE)
13+
14+
# Currently 'main' for IDF_TARGET=linux is defined in freertos component.
15+
# Since we are using a freertos mock here, need to let Catch2 provide 'main'.
16+
target_link_libraries(${COMPONENT_LIB} PRIVATE Catch2WithMain)

0 commit comments

Comments
 (0)