From nobody Mon Nov 16 14:45:56 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 4jSrJj0zKfz70nNw for ; Mon, 16 Nov 2026 14:45: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSrJh72nZz4MLD for ; Mon, 16 Nov 2026 14:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794840357; 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=BOiBr31MMdStxBmHjAwosuaYmMeNZ0jz5OlZZaqny2U=; b=yv3W6eIOX3SG2tWAnLE5/ywZT96HnlKJHdXW2BoJP9ADMOgZA7/FdYIpp6XVZhi6OFxNjJ hDrG6t9s/kec8cT2NFnpxtvErPDDAdEQCZRNrWvNQvbYd+QHm/bcvt7dA88EN8/dj08U3y gfz6MdyZcZ2/U6f1aABgWqZ+ywARKL5alN3r4enRGR+DJ50y4UHD4nefh4teNMXNFA+cwW DdnMe3NwYm/86iWOkPB5upArQUTSnXuTAdqqZX7CQoABFzN8oF4fANDPReST3GlGQ3ZWWQ lJg8DCTrhli8AJIsEIlb3KAR+IoE6EEu2KOeViK7unbbrkHPVVzSV6XXM1BAdQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794840357; b=k+780NtWqPgr2tIykRvifIA9TiRF1RA540lxBJFspypzqNGIpQrK0YHUnvYfTRwqvJAOYQ KDt8enYFym92aZ7S1OArCGDJ8T5k2KBBvPjoXE0Joya88y2TU9Jxav7bUrh33YWJVVwZZF 3hgoksIGVwTRcMFOqSvhyDv00RKMTbwwggbKPoptK1DEKc0i6SZS5vNKCTH0gqw/TylPdR gQN+tXroNESYg+YLzes3nZwBxjymSKIOjERSDz+G78TG+ZDIAB2817HSAQY1f1At9y1A1N 3DHtAygh1iloe8OwbtNGV8SnE9tXOWEyU4msy6WqHEWdYVbBghuefJlK9aT/PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794840357; 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=BOiBr31MMdStxBmHjAwosuaYmMeNZ0jz5OlZZaqny2U=; b=kI30Czo+GVia7ymnTO6DteVYABqcoXmUiQ55Wz+mRgpG5LgqR1olyuy4N7YuEoNP46QvuE PP2h6QSNySKzMXzHAMG++oKP/HlwtOzRFkYAs7uJvNquIFck9SQnKolZLsCsdyZNffMvv8 Or+D7GY3htyTWoQwnNXYM7s971e63bgoxvbfRgxNEnweFADPnYYk3KJ43+COXlJ30VVl7G 01MMRPk29eyS0XX/ggc+erKrOju9zZG+rluShX/LJirQCLEmbh8OlNNfUXNgLSD8LfG+P3 +NTQVvbV/pZ/BvjdXGhH+lMxZlORZRB/6NElBHgQEKn3dKnpcBETVa1xPix+AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSrJh6jY8zyFt for ; Mon, 16 Nov 2026 14:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 14:45:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fb79a9409173 - main - pax: Add tests List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb79a940917329183a54dcecd89de389ead3c565 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 14:45:56 +0000 Message-Id: <6afb1724.1d58.34b0edbf@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb79a940917329183a54dcecd89de389ead3c565 commit fb79a940917329183a54dcecd89de389ead3c565 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-16 14:44:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-16 14:44:20 +0000 pax: Add tests Add tests exercising pax copy mode, cpio passthrough mode, the ability to extract pax, cpio, and tar archives, and the ability to parse pax, cpio, and tar command lines. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: obiwac Differential Revision: https://reviews.freebsd.org/D58469 --- bin/pax/tests/Makefile | 3 +- bin/pax/tests/pax_test.sh | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile index 1ebe2e3f7c9d..143022a5409a 100644 --- a/bin/pax/tests/Makefile +++ b/bin/pax/tests/Makefile @@ -1,5 +1,4 @@ -.include - +ATF_TESTS_SH= pax_test TAP_TESTS_PERL= legacy_test .include diff --git a/bin/pax/tests/pax_test.sh b/bin/pax/tests/pax_test.sh new file mode 100644 index 000000000000..3dff6b2b0f3f --- /dev/null +++ b/bin/pax/tests/pax_test.sh @@ -0,0 +1,109 @@ +# +# Copyright (c) 2026 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +prepare_cmd() { + cmd="${PWD}/${1:-pax}" + atf_check ln -sf "$(command -v pax)" "${cmd}" +} + +prepare_tree() { + local root=${1:-.} + atf_check mkdir -p "${root}"/dir/subdir + atf_check -o save:"${root}"/dir/subdir/file echo 'Hello, world!' + atf_check ln "${root}"/dir/subdir/file "${root}"/dir/subdir/link + atf_check ln -s subdir/file "${root}"/dir/link +} + +check_tree() { + local root=${1:-.} + atf_check test -d "${root}" + atf_check test -d "${root}"/dir + atf_check test -d "${root}"/dir/subdir + atf_check test -f "${root}"/dir/subdir/file + atf_check test ! -L "${root}"/dir/subdir/link + atf_check test "${root}"/dir/subdir/link -ef "${root}"/dir/subdir/file + atf_check test -L "${root}"/dir/link + atf_check test "${root}"/dir/link -ef "${root}"/dir/subdir/file +} + +atf_test_case pax_copy +pax_copy_head() { + atf_set descr "Exercise pax copy mode" + atf_set require.progs "pax" +} +pax_copy_body() { + prepare_cmd pax + prepare_tree + atf_check \ + -s exit:1 \ + -e match:'Cannot access destination directory' \ + pax -rw dir dst + atf_check mkdir dst + atf_check "${cmd}" -rw dir dst + check_tree dst +} + +atf_test_case cpio_copy +cpio_copy_head() { + atf_set descr "Exercise cpio pass-through mode" + atf_set require.progs "pax" +} +cpio_copy_body() { + prepare_cmd cpio + prepare_tree + atf_check -o save:list find dir + atf_check mkdir dst + atf_check "${cmd}" -p dst < list + check_tree dst +} + +atf_test_case pax_extract +pax_extract_head() { + atf_set descr "Extract a pax archive and exercise pax personality" + atf_set require.progs "bsdtar pax" +} +pax_extract_body() { + prepare_cmd pax + prepare_tree src + atf_check bsdtar -cf test --format=pax -C src dir + atf_check "${cmd}" -rf test + check_tree +} + +atf_test_case cpio_extract +cpio_extract_head() { + atf_set descr "Extract a cpio archive and exercise cpio personality" + atf_set require.progs "bsdtar pax" +} +cpio_extract_body() { + prepare_cmd cpio + prepare_tree src + atf_check bsdtar -cf test --format=cpio -C src dir + atf_check "${cmd}" -i < test + check_tree +} + +atf_test_case tar_extract +tar_extract_head() { + atf_set descr "Extract a tar archive and exercise tar personality" + atf_set require.progs "bsdtar pax" +} +tar_extract_body() { + prepare_cmd tar + prepare_tree src + atf_check bsdtar -cf test --format=ustar -C src dir + atf_check "${cmd}" -xf test + check_tree +} + +atf_init_test_cases() +{ + atf_add_test_case pax_copy + atf_add_test_case cpio_copy + atf_add_test_case pax_extract + atf_add_test_case cpio_extract + atf_add_test_case tar_extract +}