Page MenuHomeFreeBSD
Files F162210464

D58040.id.diff
No OneTemporary
Actions

D58040.id.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20260707: Move sendfile_helper to tests/sys/common
+OLD_FILES+=usr/tests/sys/kern/sendfile_helper
+
# 20260707: Removed GNU subtree
OLD_FILES+=usr/tests/gnu/Kyuafile
OLD_FILES+=usr/tests/gnu/lib/Kyuafile
diff --git a/tests/sys/common/Makefile b/tests/sys/common/Makefile
--- a/tests/sys/common/Makefile
+++ b/tests/sys/common/Makefile
@@ -9,4 +9,8 @@
${PACKAGE}FILESMODE_sender.py=0555
${PACKAGE}FILESMODE_net_receiver.py=0555
+BINDIR= ${TESTSDIR}
+PROGS+= sendfile_helper
+LIBADD.sendfile_helper+= pthread
+
.include <bsd.test.mk>
diff --git a/tests/sys/kern/sendfile_helper.c b/tests/sys/common/sendfile_helper.c
rename from tests/sys/kern/sendfile_helper.c
rename to tests/sys/common/sendfile_helper.c
--- a/tests/sys/kern/sendfile_helper.c
+++ b/tests/sys/common/sendfile_helper.c
@@ -43,7 +43,7 @@
#include <unistd.h>
static char buf[1024*1024];
-ssize_t readlen;
+static ssize_t readlen;
static volatile bool read_done = false;
static int
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -92,7 +92,6 @@
BINDIR= ${TESTSDIR}
PROGS+= coredump_phnum_helper
PROGS+= pdeathsig_helper
-PROGS+= sendfile_helper
CFLAGS.aslr+= -I${SRCTOP}/tests
LIBADD.aslr+= util
@@ -116,7 +115,6 @@
LIBADD.shutdown_dgram+= pthread
LIBADD.socket_msg_waitall+= pthread
LIBADD.socket_splice+= pthread
-LIBADD.sendfile_helper+= pthread
LIBADD.fdgrowtable_test+= util pthread kvm procstat
LIBADD.sigwait+= rt
LIBADD.ktrace_test+= sysdecode
diff --git a/tests/sys/kern/sendfile_test.sh b/tests/sys/kern/sendfile_test.sh
--- a/tests/sys/kern/sendfile_test.sh
+++ b/tests/sys/kern/sendfile_test.sh
@@ -38,7 +38,7 @@
MD_DEVS="md.devs"
MNT=mnt
FILE=$MNT/file
-HELPER="$(atf_get_srcdir)/sendfile_helper"
+HELPER="$(atf_get_srcdir)/../common/sendfile_helper"
BSIZE=4096
atf_test_case io_success cleanup

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 11, 10:39 PM (3 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34976732
Default Alt Text
D58040.id.diff (2 KB)

Event Timeline