diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cc9934..6e70177 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,8 @@ include(${CMAKE_DIR}/functions.cmake) include(${CMAKE_DIR}/definitions.cmake) include(${CMAKE_DIR}/dependencies.cmake) -add_option(ENABLE_TESTS "Enables the building of the test modules") +add_option(ENABLE_UNIT_TESTS "Enables the building of the unit test modules") +add_option(ENABLE_FUZZ_TESTS "Enables the building of the fuzz test modules") add_option(ENABLE_STATIC_ANALYSIS "Makes clang-tidy checks mandatory for compilation") if (ENABLE_STATIC_ANALYSIS) diff --git a/conanfile.py b/conanfile.py index 18e21bc..12e62df 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,7 +11,8 @@ class LightRecipe(ConanFile): generators = "CMakeDeps" options = { - "enable_tests": [True, False], + "enable_unit_tests": [True, False], + "enable_fuzz_tests": [True, False], "enable_llvm_coverage": [True, False], "enable_static_analysis": [True, False], "use_mold": [True, False], @@ -19,7 +20,8 @@ class LightRecipe(ConanFile): } default_options = { - "enable_tests": True, + "enable_unit_tests": True, + "enable_fuzz_tests": False, "enable_llvm_coverage": False, "enable_static_analysis": False, "use_mold": False, @@ -46,7 +48,8 @@ class LightRecipe(ConanFile): tc.cache_variables["CMAKE_LINKER_TYPE"] = "MOLD" tc.cache_variables["CMAKE_EXPORT_COMPILE_COMMANDS"] = self.options.export_compile_commands - tc.cache_variables["ENABLE_TESTS"] = self.options.enable_tests + tc.cache_variables["ENABLE_UNIT_TESTS"] = self.options.enable_unit_tests + tc.cache_variables["ENABLE_FUZZ_TESTS"] = self.options.enable_fuzz_tests tc.cache_variables["ENABLE_LLVM_COVERAGE"] = self.options.enable_llvm_coverage tc.cache_variables["ENABLE_STATIC_ANALYSIS"] = self.options.enable_static_analysis diff --git a/tools/ci/amd64/clang/coverage.dockerfile b/tools/ci/amd64/clang/coverage.dockerfile index 2a2f41c..3f0a6da 100644 --- a/tools/ci/amd64/clang/coverage.dockerfile +++ b/tools/ci/amd64/clang/coverage.dockerfile @@ -21,7 +21,8 @@ RUN pacman -S --noconfirm --disable-download-timeout \ curl \ wget \ zlib \ - libc++ + libc++ \ + libinput RUN pip install --no-cache-dir --break-system-packages conan gitpython \ && conan profile detect @@ -37,7 +38,7 @@ RUN pip --version \ && llvm-cov --version RUN git clone 'https://git.light7734.com/light7734/light.git' \ - && cd light; git checkout 'ci/code_cov' \ + && cd light \ && conan build . \ -c tools.system.package_manager:mode=install \ -c tools.cmake.cmaketoolchain:generator=Ninja \ diff --git a/tools/ci/amd64/gcc/unit_tests.sh b/tools/ci/amd64/gcc/unit_tests.sh index a23b555..651fe88 100755 --- a/tools/ci/amd64/gcc/unit_tests.sh +++ b/tools/ci/amd64/gcc/unit_tests.sh @@ -8,7 +8,7 @@ conan build . \ -c tools.system.package_manager:mode=install \ -c tools.cmake.cmaketoolchain:generator=Ninja \ -s build_type=Release \ - -o enable_tests=True \ + -o enable_unit_tests=True \ -o use_mold=True \ --build=missing diff --git a/tools/ci/amd64/gcc/valgrind.sh b/tools/ci/amd64/gcc/valgrind.sh index 453f8aa..752201c 100755 --- a/tools/ci/amd64/gcc/valgrind.sh +++ b/tools/ci/amd64/gcc/valgrind.sh @@ -8,7 +8,7 @@ conan build . \ -c tools.system.package_manager:mode=install \ -c tools.cmake.cmaketoolchain:generator=Ninja \ -s build_type=Release \ - -o enable_tests=True \ + -o enable_unit_tests=True \ -o use_mold=True \ --build=missing diff --git a/tools/ci/static_analysis/clang_tidy.sh b/tools/ci/static_analysis/clang_tidy.sh index 5f63b9d..786d487 100755 --- a/tools/ci/static_analysis/clang_tidy.sh +++ b/tools/ci/static_analysis/clang_tidy.sh @@ -14,6 +14,7 @@ conan build . \ -c tools.cmake.cmaketoolchain:generator=Ninja \ -s build_type=Release \ -o enable_static_analysis=True \ --o enable_tests=True \ +-o enable_unit_tests=True \ +-o enable_fuzz_tests=True \ -o use_mold=True \ --build=missing diff --git a/tools/cmake/functions.cmake b/tools/cmake/functions.cmake index f087045..f7665e9 100644 --- a/tools/cmake/functions.cmake +++ b/tools/cmake/functions.cmake @@ -78,7 +78,7 @@ function (add_executable_module exename) endfunction () function (add_test_module target_lib_name) - if (NOT ${ENABLE_TESTS}) + if (NOT ${ENABLE_UNIT_TESTS}) return() endif () @@ -114,7 +114,7 @@ function (add_test_module target_lib_name) endfunction () function (add_fuzz_module target_lib_name) - if (NOT ${ENABLE_TESTS}) + if (NOT ${ENABLE_FUZZ_TESTS}) return() endif ()