From nobody Mon Oct 21 12:37:20 2024 X-Original-To: dev-commits-src-main@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 4XXFFF1kjfz5Yx86; Mon, 21 Oct 2024 12:37:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFFF146Lz4KQt; Mon, 21 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729514241; 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=xhGeYx32fNlU1QO1xpLsD3LC3T5eAdbQGBlcAV6klEQ=; b=v0yECi9BsGGBj7mStmJJHj5OpwYWcyXRvkNk95veumjpVnZ/GpZMZslWPho6zXTIpISrnJ 3k41OLalWw1mSX8a/sAk7stCJvsWb+PjS+8GUi0QorWlfM2X/UpkBNoZ9+qX0J6WYQsF2q 4DKfwhWBV58eaPd0eXKS7LyIfnof/niNzJPh7VDtWpffgExra59/Kz1kgrRCH+zpbJV+tS LzWE2HAQ0mLDEzaicY11sENgyE6DQQQmyTaNtg3XD93njZNZWnzo1oPUQI8kz41yBCF/+x E1Y7b8is9ZwU/ySFLbZzNqnsIbS4WSLuxS30jecmOAZe57Lmb0POE/YucLVAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729514241; 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=xhGeYx32fNlU1QO1xpLsD3LC3T5eAdbQGBlcAV6klEQ=; b=L5I8BsJVy1Olt4LvswbLlbYa3CbLcwY1jjfc/mKfy1MI7e1yb6cCXBlfTkv6KOnl8DGhX3 n9wY8Oquy7/ioHAM/FMfzrGGIkEDewg87qMOfOpNZRUtHMGETg8nWyNJ+Pe9CAc7dPrk6V LWiWwqMdL19+gjmHtnGhAqWAfJRND42hfU1jNCid8YQqo62Y9VSjkS0Vh6TFmiFWL20vE9 ckYuwmXDyuLf9nAw+xQWOgHrLNWKZULKsAqMSwfPuTORJPTDUMQzKJE2eVbd7oOgybzxuP N++vvFlyemAm1Htss/cOpUFlpcrGtAyO5FAcazEjdUpzeIMj4ccFnQrZB6R5KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729514241; a=rsa-sha256; cv=none; b=Rmr0Sob1ZN3lNaENl6Kl4fLGAhLpJa+gXkgzBf1phzKzlLNk0zW313sWXCIVWHcDHl9X6B OK/APR1oD2XHDRo3Y0EBbg+IKxdeU2nJzBVIbYwGDXiJ+GdlHzard70ZhA8m9gEcIHapl1 Rs/YJoA+waRIJMvv16Pk9l2Pej2IA//B0SwuC5vTL9GBgbbsGM3qxNte3g1+hDYc66wWBD nrDPs0SL24whj2JC8AE3oystwbk7jEIIM+iXTcBFphqaGMpeoZ6A6mIqyIClEt6NJtjf62 ZFoxoUNCKyPUJqfWhWej8kVFsRUBd/9xbrgk5dcylXUMWkPTs4UGup/co7Oq4A== 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 4XXFFF0gWVzWCm; Mon, 21 Oct 2024 12:37:21 +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 49LCbKdU068605; Mon, 21 Oct 2024 12:37:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCbKOr068602; Mon, 21 Oct 2024 12:37:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:37:20 GMT Message-Id: <202410211237.49LCbKOr068602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 6c40282284d6 - main - libarchive: backport PR #2386 (fixes output of one test) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c40282284d6eab20256914648cdec39acb2c52a Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c40282284d6eab20256914648cdec39acb2c52a commit 6c40282284d6eab20256914648cdec39acb2c52a Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-21 12:37:09 +0000 libarchive: backport PR #2386 (fixes output of one test) MFC after: 6 days --- contrib/libarchive/tar/test/test_option_P.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/tar/test/test_option_P.c b/contrib/libarchive/tar/test/test_option_P.c index e63da3e0875c..953d9f58991c 100644 --- a/contrib/libarchive/tar/test/test_option_P.c +++ b/contrib/libarchive/tar/test/test_option_P.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_extract_tar_absolute_paths) UNLINK(temp_absolute_file_name); // Extracting the archive without -P / --absolute-paths should strip leading drive letter or slash - r = systemf("%s -xf test.tar", testprog); + r = systemf("%s -xf test.tar 2>test.err", testprog); assertEqualInt(r, 0); assertFileNotExists(temp_absolute_file_name);