From 2e3183d3aca49fdc3835f3deed2ec6dd76179c73 Mon Sep 17 00:00:00 2001 From: rfprod Date: Thu, 5 Nov 2026 13:57:56 +0400 Subject: [PATCH] test(unit): add unit testing capabilities - [x] bump project version from `0.4.2` to `0.4.3`; - [x] move core sources into a `cpp-workspace-core` static library linked by the app; - [x] add `CPP_WORKSPACE_BUILD_TESTS` option and a `tests/` directory with a `GTest` suite; - [x] change `parse_args` to take argc by value; - [x] change `parse_args` to take argv as `const char* const[]`, and make it `const`; - [x] extract `help_text()` from `print_help()` so the help output can be tested; - [x] add `gtest/1.15.0` as a `Conan` test requirement gated by the with_tests option; - [x] add `-t/--tests` and `--no-tests` flags plus `ENABLE_TESTS` env var to `build.sh`; - [x] pass `CPP_WORKSPACE_BUILD_TESTS` to `CMake` and with_tests to Conan based on the toggle; - [x] run ctest and the `ncurses++` link check only when tests are enabled; - [x] exit with an error if the test binary is missing after the build; - [x] include `tests/` sources in the `clang-format` and `cppcheck` runs in `format.sh`; - [x] add `src/storage` and `tests/` to the `cppcheck` include paths; --- .github/workflows/trunk.yml | 4 +- .github/workflows/validate-pr.yml | 4 +- CMakeLists.txt | 54 ++++++------ conanfile.py | 13 +++ src/main.cpp | 2 +- src/utils/args_utils.cpp | 29 ++++--- src/utils/args_utils.hpp | 4 +- tests/CMakeLists.txt | 16 ++++ tests/args_utils_test.cpp | 139 ++++++++++++++++++++++++++++++ tools/shell/build.sh | 71 +++++++++++++-- tools/shell/format.sh | 20 +++-- 11 files changed, 305 insertions(+), 51 deletions(-) create mode 100644 tests/CMakeLists.txt create mode 100644 tests/args_utils_test.cpp diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 5943389..d5a1894 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -83,6 +83,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y build-essential cmake git python3-pip clang-format clang-tidy cppcheck + sudo apt-get install -y libcurl4-openssl-dev - name: Install Conan if: ${{ steps.src-changed.outputs.change == 'true' || steps.deps-changed.outputs.change == 'true' }} @@ -98,7 +99,7 @@ jobs: if: ${{ steps.src-changed.outputs.change == 'true' || steps.deps-changed.outputs.change == 'true' }} run: | source .venv/bin/activate - conan install . --build=missing -s build_type="${BUILD_TYPE}" + conan install . --build=missing -s build_type="${BUILD_TYPE}" -o "with_tests=True" deactivate env: BUILD_TYPE: Release @@ -126,6 +127,7 @@ jobs: cmake -S . -B "build/${BUILD_TYPE}" \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DCMAKE_TOOLCHAIN_FILE="$PWD/build/${BUILD_TYPE}/generators/conan_toolchain.cmake" \ + -DCPP_WORKSPACE_BUILD_TESTS="ON" \ -DCMAKE_CXX_COMPILER=g++-13 cmake --build "build/${BUILD_TYPE}" \ --parallel diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index b473ed7..236539c 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -87,6 +87,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y build-essential cmake git python3-pip clang-format clang-tidy cppcheck + sudo apt-get install -y libcurl4-openssl-dev - name: Install Conan if: ${{ steps.src-changed.outputs.change == 'true' || steps.deps-changed.outputs.change == 'true' }} @@ -101,7 +102,7 @@ jobs: if: ${{ steps.src-changed.outputs.change == 'true' || steps.deps-changed.outputs.change == 'true' }} run: | source .venv/bin/activate - conan install . --build=missing -s build_type="${BUILD_TYPE}" + conan install . --build=missing -s build_type="${BUILD_TYPE}" -o "with_tests=True" deactivate env: BUILD_TYPE: Release @@ -128,6 +129,7 @@ jobs: cmake -S . -B "build/${BUILD_TYPE}" \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DCMAKE_TOOLCHAIN_FILE="$PWD/build/${BUILD_TYPE}/generators/conan_toolchain.cmake" \ + -DCPP_WORKSPACE_BUILD_TESTS="ON" \ -DCMAKE_CXX_COMPILER=g++-13 cmake --build "build/${BUILD_TYPE}" \ --parallel diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d74a29..65614be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -project(cpp-workspace VERSION 0.4.2 LANGUAGES CXX) +project(cpp-workspace VERSION 0.4.3 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -11,38 +11,44 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -add_executable(cpp-workspace-app - src/main.cpp - src/interface/progress_spinner.cpp - src/interface/user_interface.cpp - src/ollama/ollama_client.cpp - src/storage/qdrant_client.cpp - src/utils/args_utils.cpp - src/utils/curl_utils.cpp - src/utils/text_utils.cpp - src/utils/system_utils.cpp - src/utils/embedding_utils.cpp - src/utils/retrieving_utils.cpp - src/utils/http_utils.hpp -) +option(CPP_WORKSPACE_BUILD_TESTS "Build unit tests" ON) -target_include_directories(cpp-workspace-app - PRIVATE - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_SOURCE_DIR}/src/interface - ${CMAKE_SOURCE_DIR}/src/ollama - ${CMAKE_SOURCE_DIR}/src/storage - ${CMAKE_SOURCE_DIR}/src/utils -) +message(STATUS "Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}") +file(GLOB_RECURSE CORE_SOURCES CONFIGURE_DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/src/interface/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/interface/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/ollama/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/ollama/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/storage/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/storage/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/*.hpp) +if(NOT CORE_SOURCES) + message(FATAL_ERROR "No core sources found. Check the paths in CORE_SOURCES.") +endif() +add_library(cpp-workspace-core + STATIC + ${CORE_SOURCES}) +target_include_directories(cpp-workspace-core + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/src) + +add_executable(cpp-workspace-app src/main.cpp) +target_link_libraries(cpp-workspace-app PRIVATE cpp-workspace-core) find_package(fmt REQUIRED) find_package(CURL REQUIRED) find_package(nlohmann_json REQUIRED) find_package(Curses REQUIRED) -target_link_libraries(cpp-workspace-app +target_link_libraries(cpp-workspace-core PRIVATE fmt::fmt CURL::libcurl nlohmann_json::nlohmann_json Curses::Curses ) + +if(CPP_WORKSPACE_BUILD_TESTS) + enable_testing() + add_subdirectory(tests) +endif() diff --git a/conanfile.py b/conanfile.py index 954b50b..75f1be1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,6 +5,17 @@ class AppConan(ConanFile): settings = "os", "compiler", "build_type", "arch" + options = {"with_tests": [True, False]} + + default_options = { + "with_tests": False, + ## + # If ncurses++ is linked (check using `grep -c "ncurses++" build/Release/tests/CMakeFiles/cpp-workspace-tests.dir/link.txt`), + # unit tests will fail if `GTest::gtest_main` is linked after `cpp-workspace-core` in `./tests/CMakeLists.txt`. + ## + "ncurses/*:with_cxx": False, + } + generators = "CMakeDeps", "CMakeToolchain" def requirements(self): @@ -13,6 +24,8 @@ def requirements(self): self.requires("libcurl/8.5.0") self.requires("nlohmann_json/3.11.2") self.requires("ncurses/6.5") + if getattr(self.options, "with_tests") == True and self.test_requires != None: + self.test_requires("gtest/1.15.0") def layout(self): cmake_layout(self) diff --git a/src/main.cpp b/src/main.cpp index 84a48c6..8a2e69b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ int main(int argc, const char* argv[]) { std::string message{}; ArgsUtils args_utils; - struct ParsedArgs parsed_args = args_utils.parse_args(&argc, argv); + struct ParsedArgs parsed_args = args_utils.parse_args(argc, argv); if (parsed_args.help == true) { args_utils.print_help(); diff --git a/src/utils/args_utils.cpp b/src/utils/args_utils.cpp index 767e461..2358e04 100644 --- a/src/utils/args_utils.cpp +++ b/src/utils/args_utils.cpp @@ -28,7 +28,7 @@ ArgsUtils::ArgsUtils() { * @param argv Array of argument strings from main() * @return ParsedArgs struct containing all parsed argument values */ -struct ParsedArgs ArgsUtils::parse_args(const int* argc, const char* argv[]) { +struct ParsedArgs ArgsUtils::parse_args(const int argc, const char* const argv[]) const { struct ParsedArgs parsed_args {}; parsed_args.model = "gemma3n:latest"; parsed_args.embedding_model = "embeddinggemma:latest"; @@ -41,7 +41,7 @@ struct ParsedArgs ArgsUtils::parse_args(const int* argc, const char* argv[]) { parsed_args.help = false; std::string arg{}; - for (int i = 1; i < *argc; i += 1) { + for (int i = 1; i < argc; i += 1) { arg = argv[i]; size_t eq_pos = arg.find('='); @@ -49,11 +49,9 @@ struct ParsedArgs ArgsUtils::parse_args(const int* argc, const char* argv[]) { continue; } - std::string key = arg.substr(0, eq_pos); - std::string val = arg.substr(eq_pos + 1); - - if (handlers.count(key)) { - handlers[key](val, &parsed_args); + auto it = handlers.find(arg.substr(0, eq_pos)); + if (it != handlers.end()) { + it->second(arg.substr(eq_pos + 1), &parsed_args); } } @@ -61,11 +59,10 @@ struct ParsedArgs ArgsUtils::parse_args(const int* argc, const char* argv[]) { } /** - * Prints usage information for all supported runtime arguments and exits. - * Displays each argument name, type, description, and default value. + * Returns the help text containing information about all supported runtime arguments. */ -void ArgsUtils::print_help() { - printf("Usage: app [OPTIONS]\n\n" +const char* ArgsUtils::help_text() { + return "Usage: app [OPTIONS]\n\n" "Options:\n" " --model= The LLM model to use for inference.\n" " (default: gemma3n:latest)\n\n" @@ -84,7 +81,15 @@ void ArgsUtils::print_help() { " --skip_embedding= Skip embedding creation.\n" " (default: false)\n\n" " --help= Print help.\n" - " (default: false)\n"); + " (default: false)\n"; +} + +/** + * Prints usage information for all supported runtime arguments and exits. + * Displays each argument name, type, description, and default value. + */ +void ArgsUtils::print_help() { + printf("%s", this->help_text()); std::exit(0); } diff --git a/src/utils/args_utils.hpp b/src/utils/args_utils.hpp index 690b3b8..04af4ec 100644 --- a/src/utils/args_utils.hpp +++ b/src/utils/args_utils.hpp @@ -39,7 +39,9 @@ class ArgsUtils { public: ArgsUtils(); - struct ParsedArgs parse_args(const int* argc, const char* argv[]); + struct ParsedArgs parse_args(const int argc, const char* const argv[]) const; + + const char* help_text(); void print_help(); }; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..00710fa --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,16 @@ +find_package(GTest CONFIG REQUIRED) + +add_executable(cpp-workspace-tests + args_utils_test.cpp +) + +target_link_libraries(cpp-workspace-tests + PRIVATE + # GTest::gtest_main - should be linked before `cpp-workspace-core` if the core library links `ncurses++` or similar C++ bindings that add `main()`. + cpp-workspace-core + GTest::gtest_main +) + +include(GoogleTest) +gtest_discover_tests(cpp-workspace-tests DISCOVERY_MODE PRE_TEST) + diff --git a/tests/args_utils_test.cpp b/tests/args_utils_test.cpp new file mode 100644 index 0000000..9834e5b --- /dev/null +++ b/tests/args_utils_test.cpp @@ -0,0 +1,139 @@ +#include + +#include +#include +#include +#include +#include +#include + +#include "utils/args_utils.hpp" + +namespace { + +// Owns the strings so the const char* pointers remain valid for the test. +class Argv { + public: + Argv(std::initializer_list args = {}) : storage_{"app"} { + storage_.insert(storage_.end(), args.begin(), args.end()); + ptrs_.reserve(storage_.size()); + std::transform(storage_.begin(), storage_.end(), std::back_inserter(ptrs_), + [](const std::string& s) { return s.c_str(); }); + argc_ = static_cast(ptrs_.size()); + } + Argv(const Argv&) = delete; + Argv& operator=(const Argv&) = delete; + + int argc() const { + return argc_; + } + const char* const* argv() const { + return ptrs_.data(); + } + + private: + std::vector storage_; + std::vector ptrs_; + int argc_ = 0; +}; + +} // namespace + +TEST(ArgsUtilsDefaults, ReturnsDefaultsWhenNoArgsGiven) { + ArgsUtils utils; + Argv argv; + auto p = utils.parse_args(argv.argc(), argv.argv()); + + EXPECT_EQ(p.model, "gemma3n:latest"); + EXPECT_EQ(p.embedding_model, "embeddinggemma:latest"); + EXPECT_EQ(p.prompt, "Hey! What's up!"); + EXPECT_FALSE(p.stream); + EXPECT_FALSE(p.rag); + EXPECT_FALSE(p.interactive); + EXPECT_FALSE(p.dark_theme); + EXPECT_FALSE(p.skip_embedding); + EXPECT_FALSE(p.help); +} + +TEST(ArgsUtilsParse, AssignsStringValues) { + ArgsUtils utils; + Argv argv{"--model=llama3", "--embedding_model=nomic", "--prompt=hi there"}; + auto p = utils.parse_args(argv.argc(), argv.argv()); + + EXPECT_EQ(p.model, "llama3"); + EXPECT_EQ(p.embedding_model, "nomic"); + EXPECT_EQ(p.prompt, "hi there"); +} + +TEST(ArgsUtilsParse, SplitsOnFirstEqualsOnly) { + ArgsUtils utils; + Argv argv{"--prompt=a=b"}; + EXPECT_EQ(utils.parse_args(argv.argc(), argv.argv()).prompt, "a=b"); +} + +TEST(ArgsUtilsParse, EmptyValueYieldsEmptyString) { + ArgsUtils utils; + Argv argv{"--model="}; + EXPECT_EQ(utils.parse_args(argv.argc(), argv.argv()).model, ""); +} + +TEST(ArgsUtilsParse, LastOccurrenceWins) { + ArgsUtils utils; + Argv argv{"--model=a", "--model=b"}; + EXPECT_EQ(utils.parse_args(argv.argc(), argv.argv()).model, "b"); +} + +TEST(ArgsUtilsParse, IgnoresArgsWithoutEquals) { + ArgsUtils utils; + Argv argv{"--stream", "--model"}; + auto p = utils.parse_args(argv.argc(), argv.argv()); + + EXPECT_FALSE(p.stream); + EXPECT_EQ(p.model, "gemma3n:latest"); +} + +TEST(ArgsUtilsParse, IgnoresUnknownKeys) { + ArgsUtils utils; + Argv argv{"--unknown=x"}; + auto p = utils.parse_args(argv.argc(), argv.argv()); + + EXPECT_EQ(p.model, "gemma3n:latest"); + EXPECT_FALSE(p.stream); +} + +using BoolField = bool ParsedArgs::*; +using BoolCase = std::pair; + +class BoolFlagTest : public testing::TestWithParam {}; + +TEST_P(BoolFlagTest, ExactTrueEnablesFlag) { + ArgsUtils utils; + Argv argv{GetParam().first + "=true"}; + auto p = utils.parse_args(argv.argc(), argv.argv()); + EXPECT_TRUE(p.*GetParam().second); +} + +TEST_P(BoolFlagTest, NonExactTrueValuesLeaveFlagDisabled) { + ArgsUtils utils; + for (const char* val : {"TRUE", "1", "yes", "false"}) { + Argv argv{GetParam().first + "=" + val}; + auto p = utils.parse_args(argv.argc(), argv.argv()); + EXPECT_FALSE(p.*GetParam().second) << "value: " << val; + } +} + +INSTANTIATE_TEST_SUITE_P(AllBoolFlags, BoolFlagTest, + testing::Values(BoolCase{"--stream", &ParsedArgs::stream}, BoolCase{"--rag", &ParsedArgs::rag}, + BoolCase{"--interactive", &ParsedArgs::interactive}, + BoolCase{"--dark_theme", &ParsedArgs::dark_theme}, + BoolCase{"--skip_embedding", &ParsedArgs::skip_embedding}, + BoolCase{"--help", &ParsedArgs::help})); + +TEST(ArgsUtilsHelp, DocumentsEveryHandledFlag) { + ArgsUtils utils; + const std::string text = utils.help_text(); + for (const char* key : {"--model=", "--embedding_model=", "--prompt=", "--stream=", "--rag=", "--interactive=", + "--dark_theme=", "--skip_embedding=", "--help="}) { + EXPECT_NE(text.find(key), std::string::npos) << "missing: " << key; + } +} diff --git a/tools/shell/build.sh b/tools/shell/build.sh index 2cb55c0..726d870 100644 --- a/tools/shell/build.sh +++ b/tools/shell/build.sh @@ -19,6 +19,8 @@ show_help() { -r, --release Build in Release mode (default: Debug) -p, --package Package release artifacts -b DIR, --build-dir DIR Specify build directory (default: build) + -t, --tests Build and run unit tests (default: off) + --no-tests Build without unit tests (overrides ENABLE_TESTS) --cxx-flags FLAGS Set CMAKE_CXX_FLAGS (default: -DDEBUG) --no-debug-flags Build without -DDEBUG flag --exe-args ARGS Pass arguments to executable (e.g., '--skip_embedding=true')" @@ -26,6 +28,7 @@ show_help() { echo -e "${YELLOW}Environment Variables:${NC} BUILD_TYPE Set build type: Debug or Release (default: Debug) CLEAN_BUILD Set to true to clean before building (default: false) + ENABLE_TESTS Set to true to build and run tests (default: false) CMAKE_CXX_FLAGS Set C++ compiler flags (default: -DDEBUG) EXECUTABLE_ARGS Arguments to pass to the executable" @@ -35,6 +38,11 @@ show_help() { ./tools/shell/build.sh --cxx-flags '-DDEBUG -Wall' # Custom flags ./tools/shell/build.sh --no-debug-flags # No debug flags ./tools/shell/build.sh --exe-args '--skip_embedding=true --other-arg=true' # Pass args to exe + ./tools/shell/build.sh --tests # Debug build with tests + ./tools/shell/build.sh --release --tests # Release build with tests + + ENABLE_TESTS=true ./tools/shell/build.sh # Via env var + CMAKE_CXX_FLAGS='-O3' ./tools/shell/build.sh # Via env var" } @@ -42,6 +50,7 @@ show_help() { BUILD_DIR="build" BUILD_TYPE="${BUILD_TYPE:-Debug}" CLEAN_BUILD="${CLEAN_BUILD:-false}" +ENABLE_TESTS="${ENABLE_TESTS:-false}" PACKAGE_RELEASE="${PACKAGE_RELEASE:-false}" # Additional configuration CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS:--DDEBUG}" @@ -70,6 +79,14 @@ while [[ $# -gt 0 ]]; do BUILD_DIR="$2" shift 2 ;; + -t|--tests) + ENABLE_TESTS=true + shift + ;; + --no-tests) + ENABLE_TESTS=false + shift + ;; --cxx-flags) CMAKE_CXX_FLAGS="$2" shift 2 @@ -174,6 +191,28 @@ load_env_file() { fi } +# Checks whether ncurses++ is linked to the core library. +check_test_link_for_ncurses_cxx() { + local LINK_FILE="$BUILD_DIR/$BUILD_TYPE/tests/CMakeFiles/cpp-workspace-tests.dir/link.txt" + + if [ ! -f "$LINK_FILE" ]; then + log_warning "Test link file not found at $LINK_FILE, skipping ncurses++ check" + return 0 + fi + + local COUNT + COUNT=$(grep -c "ncurses++" "$LINK_FILE" || true) + + if [ "$COUNT" -gt 0 ]; then + log_error "Test link line references ncurses++ (C++ binding), which can reintroduce a competing main()" + log_error "Ensure the ncurses Conan option with_cxx is False and clean the build directory" + exit 1 + fi + + log_success "Test link line is free of ncurses++" +} + + # Main build script main() { ensure_project_root @@ -191,6 +230,14 @@ main() { log_info "Version: ${VERSION}, Build: ${BUILD_NUMBER}" + local TESTS_CMAKE_FLAG + TESTS_CMAKE_FLAG=OFF + if [ "$ENABLE_TESTS" = true ]; then + TESTS_CMAKE_FLAG=ON + fi + + log_info "Enable tests: ${ENABLE_TESTS}, Tests CMake Flag: ${TESTS_CMAKE_FLAG}" + # Clean build directory if requested if [ "$CLEAN_BUILD" = true ]; then log_info "Cleaning build directory..." @@ -201,7 +248,7 @@ main() { mkdir -p "$BUILD_DIR" log_info "Installing Conan dependencies..." - if conan install . --build=missing -s build_type="$BUILD_TYPE"; then + if conan install . --build=missing -s build_type="$BUILD_TYPE" -o "with_tests=$([ "$ENABLE_TESTS" = true ] && echo True || echo False)"; then log_success "Dependencies installed" else log_error "Failed to install dependencies" @@ -209,7 +256,7 @@ main() { fi log_info "Configuring CMake (${BUILD_TYPE})..." - if cmake -S . -B "$BUILD_DIR"/"$BUILD_TYPE" -DCMAKE_TOOLCHAIN_FILE="$PWD"/"$BUILD_DIR"/"$BUILD_TYPE"/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" -DCMAKE_C_COMPILER=gcc-13 -DCMAKE_CXX_COMPILER=g++-13; then + if cmake -S . -B "$BUILD_DIR"/"$BUILD_TYPE" -DCMAKE_TOOLCHAIN_FILE="$PWD"/"$BUILD_DIR"/"$BUILD_TYPE"/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DCPP_WORKSPACE_BUILD_TESTS="$TESTS_CMAKE_FLAG" -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" -DCMAKE_C_COMPILER=gcc-13 -DCMAKE_CXX_COMPILER=g++-13; then log_success "CMake configured" else @@ -225,11 +272,23 @@ main() { exit 1 fi - log_info "Running tests..." - if ctest --test-dir "$BUILD_DIR/$BUILD_TYPE" --output-on-failure; then - log_success "All tests passed" + if [ "$ENABLE_TESTS" = true ]; then + TEST_BIN="$BUILD_DIR/$BUILD_TYPE/bin/cpp-workspace-tests" + if [ ! -x "$TEST_BIN" ]; then + log_error "Test binary not found at $TEST_BIN" + exit 1 + fi + + log_info "Running tests..." + if ctest --test-dir "$BUILD_DIR/$BUILD_TYPE" --output-on-failure; then + log_success "All tests passed" + else + log_warning "Some tests failed (continuing)" + fi + + check_test_link_for_ncurses_cxx else - log_warning "Some tests failed (continuing)" + log_info "Skipping tests (use --tests to enable)" fi local BIN_NAME diff --git a/tools/shell/format.sh b/tools/shell/format.sh index 47e16a2..979e58e 100644 --- a/tools/shell/format.sh +++ b/tools/shell/format.sh @@ -9,15 +9,23 @@ cd "$REPO_ROOT" echo "Running from: $(pwd)" echo "---" -echo "Directory structure:" +echo "Directory structure [src]:" ls -la src/ echo "---" -echo "All .cpp and .hpp files:" -find src -type f \( -name "*.cpp" -o -name "*.hpp" \) +echo "Directory structure [tests]:" +ls -la tests/ +echo "---" +echo "All .cpp and .hpp files [src]:" +find src tests -type f \( -name "*.cpp" -o -name "*.hpp" \) +echo "---" +echo "All .cpp and .hpp files [tests]:" +find tests -type f \( -name "*.cpp" -o -name "*.hpp" \) echo "---" -find src -type f \( -name "*.cpp" -o -name "*.hpp" \) -exec clang-format -i -Werror {} + +echo "Checking with clang-format..." +find src tests -type f \( -name "*.cpp" -o -name "*.hpp" \) -exec clang-format -i -Werror {} + +echo "Checking with cppcheck..." cppcheck --std=c++20 \ --enable=all \ --error-exitcode=1 \ @@ -26,5 +34,7 @@ cppcheck --std=c++20 \ -I src/ \ -I src/interface \ -I src/ollama \ + -I src/storage \ -I src/utils \ - src/ + -I tests/ \ + src/ tests/