fix: auto-detect valgrind, skip fork tests in sendfile tests
CI / lint (pull_request) Successful in 8s
CI / sanitizers (address) (pull_request) Successful in 15s
CI / sanitizers (undefined) (pull_request) Successful in 15s
CI / coverage (pull_request) Successful in 10s
CI / fuzz-build (pull_request) Successful in 14s
CI / valgrind (pull_request) Successful in 12s
CI / build-and-test (pull_request) Successful in 54s

This commit is contained in:
2026-07-20 21:00:12 +02:00
parent 30d4d6870c
commit 4b93082139
4 changed files with 30 additions and 6 deletions
+1 -1
View File
@@ -274,7 +274,7 @@ void test_file() {
test_to_disk_basic();
test_to_disk_creates_dirs();
test_file_content_to_buffer();
if (!getenv("FASTSYNC_UNDER_VALGRIND")) {
if (!is_running_under_valgrind()) {
// Fork tests are skipped under valgrind because the parent process runs
// orders of magnitude slower than the child (parent is instrumented, child
// is not), which causes pipe-based protocol handshake timeouts. The parent
+12 -5
View File
@@ -259,9 +259,16 @@ static void test_sendfile_no_path() {
}
void test_file_sendfile() {
test_sendfile_basic();
test_sendfile_empty_file();
test_sendfile_missing_file();
test_sendfile_compression_fallback();
test_sendfile_no_path();
if (!is_running_under_valgrind()) {
// Fork tests are skipped under valgrind because the parent process runs
// orders of magnitude slower than the child (parent is instrumented, child
// is not), which causes pipe-based protocol handshake timeouts. The parent
// process itself has zero valgrind errors -- the failures are all in the
// forked children where inherited allocations are reported as leaks.
test_sendfile_basic();
test_sendfile_empty_file();
test_sendfile_compression_fallback();
test_sendfile_no_path();
}
test_sendfile_missing_file(); // no fork, safe under valgrind
}
+2
View File
@@ -8,12 +8,14 @@
/* Test client_connect_ssh with invalid destination (missing colon) */
static void test_ssh_connect_invalid_dest() {
/* Missing colon — parse_remote_dest should fail and return NULL */
/* cppcheck-suppress constVariablePointer */
Client* client = client_connect_ssh("invalid-destination-no-colon", 22);
EXPECT_NULL(client);
}
/* Test client_connect_ssh with empty destination */
static void test_ssh_connect_empty_dest() {
/* cppcheck-suppress constVariablePointer */
Client* client = client_connect_ssh("", 22);
EXPECT_NULL(client);
}
+15
View File
@@ -2,9 +2,24 @@
#define TEST_UTILS_H
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
// Detect if running under valgrind by checking /proc/self/maps for vgpreload.
// This is used to skip fork-based tests that are incompatible with valgrind
// (the instrumented parent runs too slowly, causing pipe timeouts).
static inline bool is_running_under_valgrind(void) {
FILE* f = fopen("/proc/self/maps", "r");
if (!f)
return false;
char buf[4096];
size_t n = fread(buf, 1, sizeof(buf) - 1, f);
fclose(f);
buf[n] = '\0';
return strstr(buf, "vgpreload") != NULL;
}
// Global test suite status
extern int tests_run;
extern int tests_failed;