talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

clamav: fix tests on sandboxed Darwin

Browse Source
This commit is contained in:
Michael Daniels 2025-06-21 12:53:31 -04:00
parent 56c41cd510
commit 5e3aab1604
4 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/by-name/cl/clamav/package.nix
View File

@ -34,9 +34,8 @@ stdenv.mkDerivation rec {
};
patches = [
# Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed
./remove-freshclam-test.patch
./sample-cofiguration-file-install-location.patch
./sample-configuration-file-install-location.patch
./use-non-existent-file-with-proper-permissions.patch
];
enableParallelBuilding = true;
@ -69,7 +68,9 @@ stdenv.mkDerivation rec {
"-DAPP_CONFIG_DIRECTORY=/etc/clamav"
];
doCheck = true;
# Seems to only fail on x86_64-darwin with sandboxing
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
__darwinAllowLocalNetworking = true;
checkInputs = [
python3.pkgs.pytest

20
pkgs/by-name/cl/clamav/remove-freshclam-test.patch
View File

@ -1,20 +0,0 @@
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 1460357ba..1194abc9d 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -371,15 +371,6 @@ if(ENABLE_APP)
set_property(TEST clamd_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
endif()
- add_test(NAME freshclam COMMAND ${PythonTest_COMMAND};freshclam_test.py
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- set_property(TEST freshclam PROPERTY ENVIRONMENT ${ENVIRONMENT})
- if(Valgrind_FOUND)
- add_test(NAME freshclam_valgrind COMMAND ${PythonTest_COMMAND};freshclam_test.py
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- set_property(TEST freshclam_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
- endif()
-
add_test(NAME sigtool COMMAND ${PythonTest_COMMAND};sigtool_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set_property(TEST sigtool PROPERTY ENVIRONMENT ${ENVIRONMENT})

0
pkgs/by-name/cl/clamav/sample-cofiguration-file-install-location.patch → pkgs/by-name/cl/clamav/sample-configuration-file-install-location.patch
View File

13
pkgs/by-name/cl/clamav/use-non-existent-file-with-proper-permissions.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/unit_tests/check_clamd.c b/unit_tests/check_clamd.c
index 2f526709a..df67c36ed 100644
--- a/unit_tests/check_clamd.c
+++ b/unit_tests/check_clamd.c
@@ -144,7 +144,7 @@ static void conn_teardown(void)
#define CLEANREPLY CLEANFILE ": OK"
#define UNKNOWN_REPLY "UNKNOWN COMMAND"
-#define NONEXISTENT PATHSEP "nonexistentfilename"
+#define NONEXISTENT PATHSEP "tmp" PATHSEP "nonexistentfilename"
#define NONEXISTENT_REPLY NONEXISTENT ": File path check failure: No such file or directory. ERROR"