From nobody Tue Sep 23 12:57:57 2025 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 4cWKlT3Vxrz68cQb; Tue, 23 Sep 2025 12:57:57 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWKlT26fRz3TMD; Tue, 23 Sep 2025 12:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758632277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMnj8DJ09nXoNWfjh4ffZtY4JcNzqno00u4bHLtMdeo=; b=Zhy/g3XZhW9rq7pd/alWOBiF8xj1nYrFJSERIROZeAKko9zP/4jN1W0cVJSqTTkeWygukc SplRamrmyVdPclIDiGJ72RSxR5C1fvcgp4mY4t+z8G1uRCYygc9mcu+27zwy4i2ffp+OKu FwowA6WBcDiZNuzMXQ/Y/N9hAm+8Xbzwz0MrSWP4f0HwKVffhvpRqkJBbcQFh0KFZJcuds jKEVvYpkMnU7kFjDEDdxaoHh4I56bGhcOpRgTubpzyZNn4urexKKS3QjiuQzus/b4l0KAS a7AJbJT0GgCw7+ztq3p7jNGx5R7X42xy+JcBTPct38m1QMucF1bvkhtySvLVjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758632277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMnj8DJ09nXoNWfjh4ffZtY4JcNzqno00u4bHLtMdeo=; b=BJqXTgA/r/Uw4IsZ8RjGD0K9bVl4cHXtRyU3qTUeC93HEjWojo36UQdbmZn6SoYQcRVDLx KKHY7L8tKgoCBXfwP/jZVgWmiDCidqvXGRvANPCXqZ+g30Af+dZEvSuwID64qUmdNxTRlq HaSwTgiHZ5NGPtLb7sxJu3/79qTWdKoB+6eoQ6VCr8yvyQmzmhLFFZDrJ17TtGARLsIjDR e85x2YzMF8f2Z+POTUxBLQil5LFyGcKQ6wBUBhqNkM6bNZTVbenUoqIv4f7LrN4II0hCBL l+HrdkhNB2ThKLgtKibl74blwZJHloYkSddDCVtpd0pLAosJaIKEmPH5CI+udg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758632277; a=rsa-sha256; cv=none; b=USInMrREumRyWZ838sIBmRIqVhaQBOHrTnNSg/XB4LsQe5lx3RNxj8pdp77dexN1/zNAsH qn76jBZnEYO9tZJ1U/f3wkbScjoLhsd+qKfVKBFVfLpEOfwSDKGIKug5hw8UfijSDmkem3 Zk67nyqSgzS+DHWsA+vde87+97N4St8fzhoy06JLoQMG2/XydnKkrgoh2IHZweYjr9Ibha MpTMKgb26U4GcYvjWSm2pC/4RWBJb+zV6nZZNiSLtnrJ8CNZFqYYJajkB2LRHxsILo6y20 sY1d0v8D8n0FQOGtqNW1a0pBTkEx+YjdVcvta0c1D0OBITNLlOAkJITwu7Ascw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cWKlT1hT3zn6l; Tue, 23 Sep 2025 12:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58NCvv7a004063; Tue, 23 Sep 2025 12:57:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NCvv20004060; Tue, 23 Sep 2025 12:57:57 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:57:57 GMT Message-Id: <202509231257.58NCvv20004060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 519a1c971e67 - stable/15 - cp: Drop test helper 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 519a1c971e67f3937dfc8744afaf082b7221caca Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=519a1c971e67f3937dfc8744afaf082b7221caca commit 519a1c971e67f3937dfc8744afaf082b7221caca Author: Dag-Erling Smørgrav AuthorDate: 2025-09-16 13:38:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-23 12:57:30 +0000 cp: Drop test helper Now that stat(1) can report whether a file is sparse, we no longer need a helper program for our tests. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52482 (cherry picked from commit 9b8224b950fb74c8674d257a5a4795baa759c35b) --- ObsoleteFiles.inc | 3 ++ bin/cp/tests/Makefile | 2 -- bin/cp/tests/cp_test.sh | 2 +- bin/cp/tests/sparse.c | 73 ------------------------------------------------- 4 files changed, 4 insertions(+), 76 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 02a727d631bd..ae83035b5de5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250911: This tool is no longer needed +OLD_FILES+=usr/tests/bin/cp/sparse + # 20250826: Remove a misspelled manual OLD_FILES+=usr/share/man/man3/sysdecode_syscallnames.3.gz diff --git a/bin/cp/tests/Makefile b/bin/cp/tests/Makefile index 3fa9ae8f0685..a1917ada8fbf 100644 --- a/bin/cp/tests/Makefile +++ b/bin/cp/tests/Makefile @@ -1,7 +1,5 @@ PACKAGE= tests ATF_TESTS_SH= cp_test -PROGS+= sparse -BINDIR= ${TESTSDIR} .include diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 999993bfad67..fdf50d042f0b 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -384,7 +384,7 @@ samefile_body() file_is_sparse() { - atf_check ${0%/*}/sparse "$1" + atf_check -o match:"^[0-9]+-[0-9]" stat -h "$1" } files_are_equal() diff --git a/bin/cp/tests/sparse.c b/bin/cp/tests/sparse.c deleted file mode 100644 index 78957581a56c..000000000000 --- a/bin/cp/tests/sparse.c +++ /dev/null @@ -1,73 +0,0 @@ -/*- - * Copyright (c) 2023 Klara, Inc. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include -#include -#include -#include - -static bool verbose; - -/* - * Returns true if the file named by its argument is sparse, i.e. if - * seeking to SEEK_HOLE returns a different value than seeking to - * SEEK_END. - */ -static bool -sparse(const char *filename) -{ - off_t hole, end; - int fd; - - if ((fd = open(filename, O_RDONLY)) < 0 || - (hole = lseek(fd, 0, SEEK_HOLE)) < 0 || - (end = lseek(fd, 0, SEEK_END)) < 0) - err(1, "%s", filename); - close(fd); - if (end > hole) { - if (verbose) - printf("%s: hole at %zu\n", filename, (size_t)hole); - return (true); - } - return (false); -} - -static void -usage(void) -{ - - fprintf(stderr, "usage: sparse [-v] file [...]\n"); - exit(EX_USAGE); -} - -int -main(int argc, char *argv[]) -{ - int opt, rv; - - while ((opt = getopt(argc, argv, "v")) != -1) { - switch (opt) { - case 'v': - verbose = true; - break; - default: - usage(); - break; - } - } - argc -= optind; - argv += optind; - if (argc == 0) - usage(); - rv = EXIT_SUCCESS; - while (argc-- > 0) - if (!sparse(*argv++)) - rv = EXIT_FAILURE; - exit(rv); -}