squash

CMakeLists.txt

@@ -8,8 +8,7 @@ include(${CMAKE_DIR}/functions.cmake)
 include(${CMAKE_DIR}/definitions.cmake)
 include(${CMAKE_DIR}/dependencies.cmake)
 
-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_TESTS "Enables the building of the test modules")
 
 add_option(ENABLE_STATIC_ANALYSIS "Makes clang-tidy checks mandatory for compilation")
 if (ENABLE_STATIC_ANALYSIS)

conanfile.py

@@ -11,8 +11,7 @@ class LightRecipe(ConanFile):
     generators = "CMakeDeps"
 
     options = {
-        "enable_unit_tests": [True, False],
-        "enable_fuzz_tests": [True, False],
+        "enable_tests": [True, False],
         "enable_llvm_coverage": [True, False],
         "enable_static_analysis": [True, False],
         "use_mold": [True, False],
@@ -20,8 +19,7 @@ class LightRecipe(ConanFile):
     }
 
     default_options = {
-        "enable_unit_tests": True,
-        "enable_fuzz_tests": False,
+        "enable_tests": True,
         "enable_llvm_coverage": False,
         "enable_static_analysis": False,
         "use_mold": False,
@@ -48,8 +46,7 @@ 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_UNIT_TESTS"] = self.options.enable_unit_tests
-        tc.cache_variables["ENABLE_FUZZ_TESTS"] = self.options.enable_fuzz_tests
+        tc.cache_variables["ENABLE_TESTS"] = self.options.enable_tests
         tc.cache_variables["ENABLE_LLVM_COVERAGE"] = self.options.enable_llvm_coverage
         tc.cache_variables["ENABLE_STATIC_ANALYSIS"] = self.options.enable_static_analysis
 

tools/ci/amd64/clang/coverage.dockerfile

@@ -21,8 +21,7 @@ RUN pacman -S --noconfirm --disable-download-timeout \
     curl \
     wget \
     zlib \
-    libc++ \
-    libinput
+    libc++
 
 RUN pip install --no-cache-dir --break-system-packages conan gitpython \
     && conan profile detect
@@ -38,7 +37,7 @@ RUN pip --version \
     && llvm-cov --version
 
 RUN git clone 'https://git.light7734.com/light7734/light.git' \
-    && cd light \
+    && cd light; git checkout 'ci/code_cov' \
     && conan build . \
         -c tools.system.package_manager:mode=install \
         -c tools.cmake.cmaketoolchain:generator=Ninja \

tools/ci/amd64/clang/coverage.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-export DISPLAY=':0'
-
 set -e
 cd $(git rev-parse --show-toplevel)/
 rm -rf ./build

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_unit_tests=True \
+  -o enable_tests=True \
   -o use_mold=True \
   --build=missing
 

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_unit_tests=True \
+  -o enable_tests=True \
   -o use_mold=True \
   --build=missing
 

tools/ci/static_analysis/clang_tidy.sh

@@ -14,7 +14,6 @@ conan build . \
 -c tools.cmake.cmaketoolchain:generator=Ninja \
 -s build_type=Release \
 -o enable_static_analysis=True \
--o enable_unit_tests=True \
--o enable_fuzz_tests=True \
+-o enable_tests=True \
 -o use_mold=True \
 --build=missing

tools/cmake/functions.cmake

@@ -78,7 +78,7 @@ function (add_executable_module exename)
 endfunction ()
 
 function (add_test_module target_lib_name)
-    if (NOT ${ENABLE_UNIT_TESTS})
+    if (NOT ${ENABLE_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_FUZZ_TESTS})
+    if (NOT ${ENABLE_TESTS})
         return()
     endif ()