From 6537b456f958341a085515d7559d6ad80613ad1c Mon Sep 17 00:00:00 2001 From: light7734 Date: Sun, 21 Sep 2025 14:02:30 +0330 Subject: [PATCH] ci(amd64/gcc/unit_tests): replace conan commands with cmake --- tools/ci/amd64/gcc/unit_tests.sh | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/tools/ci/amd64/gcc/unit_tests.sh b/tools/ci/amd64/gcc/unit_tests.sh index 3839849..4419feb 100755 --- a/tools/ci/amd64/gcc/unit_tests.sh +++ b/tools/ci/amd64/gcc/unit_tests.sh @@ -5,25 +5,18 @@ cd $(git rev-parse --show-toplevel)/ rm -rf ./build Xvfb :99 -screen 0 1024x768x16 & -export DISPLAY=:99 export CXX=$(which g++) export CC=$(which gcc) +export DISPLAY=:99 -conan build . \ - -c tools.system.package_manager:mode=install \ - -c tools.cmake.cmaketoolchain:generator=Ninja \ - -c tools.build:compiler_executables='{"c": "gcc", "cpp": "g++"}' \ - -s build_type=Release \ - -s compiler=gcc \ - -s compiler.version=15 \ - -s compiler.libcxx=libstdc++ \ - -o enable_unit_tests=True \ - -o enable_fuzz_tests=False \ - -o enable_llvm_coverage=False \ - -o enable_static_analysis=False \ - -o use_mold=True \ - -o export_compile_commands=False \ - --build=missing +cmake .. \ +-G Ninja \ +-DCMAKE_LINKER_TYPE=MOLD \ +-DENABLE_UNIT_TESTS=ON \ +-DENABLE_LLVM_COVERAGE=ON \ +-DCMAKE_BUILD_TYPE=Release \ +-DCMAKE_CXX_FLAGS="-std=c++23 -stdlib=libstdc++ -g -fno-omit-frame-pointer" \ +&& cmake --build . -j `nproc` for test in $(find ./build -type f -name '*_tests' -executable); do echo "Running $test"