espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-01 17:40:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(tools): Remove old copy of Catch2 in tools

Browse Source
This commit is contained in:
Guillaume Souchere
2025-07-07 14:37:53 +02:00
parent f8cb539e29
commit 1798034d3f
13 changed files with 22 additions and 10549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/CODEOWNERS
View File

@@ -216,7 +216,6 @@
/tools/ @esp-idf-codeowners/tools
/tools/ble/ @esp-idf-codeowners/app-utilities
/tools/bt/ @esp-idf-codeowners/bluetooth
/tools/catch/ @esp-idf-codeowners/ci
/tools/ci/ @esp-idf-codeowners/ci
/tools/cmake/ @esp-idf-codeowners/build-config
/tools/cmake/toolchain-*.cmake @esp-idf-codeowners/toolchain

5
components/esp_gdbstub/test_gdbstub_host/rv_decode/CMakeLists.txt
View File

@@ -1,4 +1,7 @@
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.22)
add_compile_options(-D__riscv_c)
add_link_options(-D__riscv_c)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
set(COMPONENTS main)

1
components/esp_gdbstub/test_gdbstub_host/rv_decode/main/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ idf_component_register(SRCS
"../../../private_include"
"../../../include"
"../../../src/port/riscv/include"
"../../../../../tools/catch"
"../../../../esp_hw_support/include"
"../../../../soc/esp32c3/include"
"../../../../esp_common/include"

7
components/esp_gdbstub/test_gdbstub_host/rv_decode/main/test_rv_decode.cpp
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -468,7 +468,6 @@ struct inst_list_s xesppie_nojump[] = {
TEST_CASE("decode rv32i instructions")
{
uintptr_t pc;
uint32_t inst;
uintptr_t inst_addr = (uintptr_t)&inst;
@@ -615,7 +614,6 @@ TEST_CASE("decode rv32i instructions")
TEST_CASE("decode rv32c instructions")
{
uintptr_t pc;
uint32_t inst;
uintptr_t inst_addr = (uintptr_t)&inst;
@@ -675,7 +673,6 @@ TEST_CASE("decode rv32c instructions")
TEST_CASE("decode rv32a instructions")
{
uintptr_t pc;
uint32_t inst;
uintptr_t inst_addr = (uintptr_t)&inst;
@@ -688,7 +685,6 @@ TEST_CASE("decode rv32a instructions")
TEST_CASE("decode rv32m instructions")
{
uintptr_t pc;
uint32_t inst;
uintptr_t inst_addr = (uintptr_t)&inst;
@@ -701,7 +697,6 @@ TEST_CASE("decode rv32m instructions")
TEST_CASE("decode xesppie instructions")
{
uintptr_t pc;
uint32_t inst;
uintptr_t inst_addr = (uintptr_t)&inst;

11
components/esp_gdbstub/test_gdbstub_host/rv_decode/pytest_gdbstub_host.py Normal file
View File

@@ -0,0 +1,11 @@
# SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Unlicense OR CC0-1.0
import pytest
from pytest_embedded import Dut
from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.host_test
@idf_parametrize('target', ['linux'], indirect=['target'])
def test_rv_decode(dut: Dut) -> None:
dut.expect_exact('All tests passed', timeout=180)

2
components/heap/test_multi_heap_host/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.22)
add_compile_options(-m32)
add_link_options(-m32)

5
docs/en/migration-guides/release-6.x/6.0/tools.rst
View File

@@ -62,3 +62,8 @@ The legacy unit-test-app has been moved out of ESP-IDF repository as no ESP-IDF
.. code-block:: bash
idf.py create-project-from-example espressif/unit-test-app:unit-test-app
Catch
-----
The header-only copy of Catch2 unit testing library previously located in tools/catch directory has been removed. To continue using Catch2 in your project, migrate to Catch2 3.x, available from the `ESP component registry <https://components.espressif.com/components/espressif/catch2>`_. For an example of migrating from Catch2 2.x to Catch2 3.x, see commit 79a2c15477dc327550ff46a64ee0f8b4679cc417.

23
tools/catch/LICENSE.txt
View File

@@ -1,23 +0,0 @@
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

4
tools/catch/README.md
View File

@@ -1,4 +0,0 @@
This directory contains header-only version of Catch C++ unit test library,
mostly used in host-side tests.
See https://github.com/philsquared/catch for more info.

10508
tools/catch/catch.hpp
View File

File diff suppressed because it is too large Load Diff

2
tools/ci/astyle-rules.yml
View File

@@ -134,8 +134,6 @@ components_not_formatted_permanent:
- "/components/console/argtable3/"
# Linenoise (upstream source code)
- "/components/console/linenoise/"
# Catch (upstream source code)
- "/tools/catch/catch.hpp"
# FreeRTOS kernel files (upstream source code)
- "/components/freertos/FreeRTOS-Kernel/"
- "/components/freertos/FreeRTOS-Kernel-SMP/"

1
tools/ci/check_copyright_ignore.txt
View File

@@ -958,7 +958,6 @@ examples/wifi/wps/main/wps.c
tools/ble/lib_ble_client.py
tools/ble/lib_gap.py
tools/ble/lib_gatt.py
tools/catch/catch.hpp
tools/ldgen/samples/template.ld
tools/ldgen/test/data/linker_script.ld
tools/test_apps/build_system/embed_test/main/test_main.c

1
tools/ci/exclude_check_tools_files.txt
View File

@@ -1,6 +1,5 @@
tools/ble/**/*
tools/bt/**/*
tools/catch/**/*
tools/check_term.py
tools/ci/*exclude*.txt
tools/ci/astyle-rules.yml