From nobody Wed Jul 8 07:52:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gw9Kl04TQz6kvj5 for ; Wed, 08 Jul 2026 07:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gw9Kk63vBz4J0d for ; Wed, 08 Jul 2026 07:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783497130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGo0PRTL8M3dwtgAKVUpaf5agcHCWwbgG2pUSTzBqDQ=; b=E3z9ag428OGwLehO2ZBA/RMn+ao5EB35+orFr7BYdMxvTr9OBTP5YXj26JgbIov050Q1kM Nyh12QxO+RRSNvtTeD2oW5sIDpfVmLCPwkbHREjz+UvAr8UZ0rlttj1qs5c1neI7+BgyUW QPxfMCr/n3Y3VT3cbYZdqj61dziBb1DtMi+tRsp6SfNdyJOehaDiHh6sKjBEW+gz6fNDaE osQm93psFUPlxQuI+YcGnOCSvm9cp+QWgbeMOoulXVOJKja8Xu/qq+1SxHqfUVC8sz7Hso Gn1c9YAIYz3kyND1LsSE4hQNCW/ITmJQiYhuhOpXs8V3cOx8bNvv7Wi8BYc9OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783497130; a=rsa-sha256; cv=none; b=LcZ5z+d6+9dmYbBSeHFQeWcOSjCH5T+ynuCBsj16YnKR+ra6xFV0pvz6/jij0LMVELkFmd 6/9ev5rSYC04L77rbJ/M0ZzJhEcYLT5BXxg9GjzKJ1eae5IBch5K/F8OnTzS/7TEf6XYf3 NhAvuY0ME+lux4T1vouV/7eNOFlkY4Ui3Req3c6nMfIUDwXOrLMWpnlsCgevCI5+MGoo4T LcIVzfQ39TRZoYMCvp67LFfK6oK2oQvh4kB0JVQPZIgLaZCNZYh71YU9f/mH6ZpIX89TAN Mp4uEE3lygWncBmoJXTLJxxcdW9OlWQZ1NJOgi8pdugn69+teRvbIXtw0DOqpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783497130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGo0PRTL8M3dwtgAKVUpaf5agcHCWwbgG2pUSTzBqDQ=; b=EYoUd94BnVxf8h2w6rC5qNfSv9EoDk5bTGnaPTw5o/p2/+KjsMsEVqUCevX0y0Wgf9rB0e Z3xXXTYsvpK9qmY72To7/dBTqMit9gVV0K8id2T1Ub2l6uihKlCzp6DurYPmcCGR/PDRh+ cs3krWCGWrQOB6XV/yYA//8FY+ArsBuG+T74DnEJ3Sq5GZFx9OR91L89nIoNH0/b2IZWFQ lEfS4/uwbLBWmpthtw+bc6chaB5scJamurXtxHepMOSuHv98BmypfOB+endpFI5l3lXfvu +RTw+4IQ2qaE+bOje7ttdxe6AjlKc1aG/dD7TJdgK9OmLmUxtRviORbxBKd7Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gw9Kk50HTz1BHj for ; Wed, 08 Jul 2026 07:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18343 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 07:52:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: KUROSAWA Takahiro From: Kristof Provost Subject: git: 6a5ba658dd48 - main - tests/sendfile: move the helper program to common List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a5ba658dd480206187776e3c25d9f710fac90fd Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 07:52:10 +0000 Message-Id: <6a4e01aa.18343.5201aeaa@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5ba658dd480206187776e3c25d9f710fac90fd commit 6a5ba658dd480206187776e3c25d9f710fac90fd Author: KUROSAWA Takahiro AuthorDate: 2026-07-07 19:09:06 +0000 Commit: Kristof Provost CommitDate: 2026-07-08 07:23:16 +0000 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 --- ObsoleteFiles.inc | 3 +++ tests/sys/common/Makefile | 4 ++++ tests/sys/{kern => common}/sendfile_helper.c | 2 +- tests/sys/kern/Makefile | 2 -- 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 diff --git a/tests/sys/kern/sendfile_helper.c b/tests/sys/common/sendfile_helper.c similarity index 99% rename from tests/sys/kern/sendfile_helper.c rename to 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 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