.gitea/workflows/ci.yaml

@@ -79,7 +79,7 @@ jobs:
       - name: Coverage Report
         run: |
           lcov --capture --directory build --output-file coverage.info --branch-coverage
-          lcov --remove coverage.info '/usr/*' '*/tests/*' '*/xxhash/*' --output-file coverage.info --branch-coverage
+          lcov --remove coverage.info '/usr/*' '*/tests/*' --output-file coverage.info --branch-coverage --ignore-errors unused
           lcov --list coverage.info
 
   valgrind:
@@ -100,4 +100,6 @@ jobs:
         run: cmake --build build -j$(nproc)
 
       - name: Valgrind Memcheck
-        run: valgrind --leak-check=full --show-leak-kinds=all --error-exitcode=1 ./build/tests
+        run: valgrind --leak-check=full --show-leak-kinds=definite --error-exitcode=1 ./build/tests
+        env:
+          FASTSYNC_UNDER_VALGRIND: "1"

.gitignore

@@ -3,3 +3,4 @@ data_copied
 test_data/
 __pycache__/
 build-asan
+coverage.info

tests/test_file.c

@@ -4,6 +4,7 @@
 #include "utils.h"
 #include "protocol.h"
 #include "test_utils.h"
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -187,14 +188,14 @@ static void test_file_send_receive() {
     bool sent = file_send_single_calls(file, p[1], false, 0, true);
     close(p[1]);
 
-    EXPECT_TRUE(sent);
-
     int status;
     waitpid(pid, &status, 0);
-    EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
 
     file_destroy(file);
     config_delete(cfg);
+
+    EXPECT_TRUE(sent);
+    EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
   }
 }
 
@@ -234,13 +235,13 @@ static void test_file_send_no_path() {
     bool sent = file_send_single_calls(file, p[1], false, 0, false);
     close(p[1]);
 
-    EXPECT_TRUE(sent);
-
     int status;
     waitpid(pid, &status, 0);
-    EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
 
     file_destroy(file);
+
+    EXPECT_TRUE(sent);
+    EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
   }
 }
 
@@ -270,7 +271,9 @@ void test_file() {
   test_to_disk_basic();
   test_to_disk_creates_dirs();
   test_file_content_to_buffer();
-  test_file_send_receive();
-  test_file_send_no_path();
+  if (!getenv("FASTSYNC_UNDER_VALGRIND")) {
+    test_file_send_receive();
+    test_file_send_no_path();
+  }
   test_file_metadata_create();
 }