diff options
| author | KUROSAWA Takahiro <takahiro.kurosawa@gmail.com> | 2026-07-07 19:09:06 +0000 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2026-07-08 07:23:16 +0000 |
| commit | 6a5ba658dd480206187776e3c25d9f710fac90fd (patch) | |
| tree | 7605a11461378e3fad5872396ac9be12752d9cc6 | |
| parent | a2426d1cd89e8cee08612951c133663dd8834838 (diff) | |
tests/sendfile: move the helper program to common
In order to reuse the sendfile_helper program in pf tests, move it
to tests/sys/common directory, indicatint that it is also used from
another places than sys/kern.
Also make the readlen variable static.
Reviewed by: gelbius, kp
Differential Revision: https://reviews.freebsd.org/D58040
| -rw-r--r-- | ObsoleteFiles.inc | 3 | ||||
| -rw-r--r-- | tests/sys/common/Makefile | 4 | ||||
| -rw-r--r-- | tests/sys/common/sendfile_helper.c (renamed from tests/sys/kern/sendfile_helper.c) | 2 | ||||
| -rw-r--r-- | tests/sys/kern/Makefile | 2 | ||||
| -rwxr-xr-x | tests/sys/kern/sendfile_test.sh | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 39690870a444..ce7ef62c0da9 100644 --- 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 index 269aa9d52f9a..e42e9537f1a8 100644 --- a/tests/sys/common/Makefile +++ b/tests/sys/common/Makefile @@ -9,4 +9,8 @@ ${PACKAGE}FILESMODE_divert.py=0555 ${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 index 6365531e312c..c92a194bff2d 100644 --- 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 index f7e06968520a..f7f5d1825e01 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -92,7 +92,6 @@ ${PACKAGE}FILESMODE_sonewconn_overflow.py=0555 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.procdesc+= kvm pthread 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 index 7e549eec610a..b2e329126d85 100755 --- 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 |