From 7a41d1f6478e36c8773ed6ee87eb6aadaa45b6e2 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 18 Nov 2026 11:31:51 -0500 Subject: [PATCH] Register C++ tests with CTest --- .gitea/workflows/ci.yml | 6 +----- cpp/CMakeLists.txt | 8 ++++++++ cpp/README.md | 9 +++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f46cebc..eb8ae32 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -66,11 +66,7 @@ jobs: run: lake env lean --run cpp/oracle/gen.lean > cpp/oracle/golden.txt - name: Run C++ tests - run: | - cpp/build/golden_test cpp/oracle/golden.txt - cpp/build/diff_corpus cpp/oracle/golden.txt - cpp/build/extreme_test - cpp/build/exhaustive_test + run: ctest --test-dir cpp/build --output-on-failure - name: Check C++ coverage run: | diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 600e8c3..725941d 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -12,6 +12,8 @@ endif() option(CR_BUILD_FUZZERS "Build libFuzzer differential/safety harnesses" ON) option(CR_BUILD_BENCH "Build the nanobench comparison" ON) +enable_testing() + add_library(cr_literal STATIC src/literal.cpp) target_include_directories(cr_literal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) @@ -41,6 +43,12 @@ target_include_directories(exhaustive_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) target_link_libraries(exhaustive_test PRIVATE cr_literal cr_fast) +set(CR_GOLDEN_VECTORS "${CMAKE_CURRENT_SOURCE_DIR}/oracle/golden.txt") +add_test(NAME golden COMMAND golden_test "${CR_GOLDEN_VECTORS}") +add_test(NAME diff_corpus COMMAND diff_corpus "${CR_GOLDEN_VECTORS}") +add_test(NAME extreme COMMAND extreme_test) +add_test(NAME exhaustive COMMAND exhaustive_test) + if(CR_BUILD_BENCH) add_executable(cr_bench tests/bench.cpp) target_include_directories(cr_bench PRIVATE diff --git a/cpp/README.md b/cpp/README.md index c1d0a70..62c912d 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -62,6 +62,15 @@ cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER=clang++-21 cmake --build build ``` +Run the registered tests with CTest: + +```sh +ctest --test-dir build --output-on-failure +``` + +`golden` and `diff_corpus` read `oracle/golden.txt`; regenerate it first if it +is missing (see below). + ## Golden vectors from Lean ```sh