From nobody Sun Oct 27 10:51:52 2024 X-Original-To: dev-commits-src-branches@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 4Xbtcm6C8mz5Zf8G; Sun, 27 Oct 2024 10:51:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtcm59Srz4m7b; Sun, 27 Oct 2024 10:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026312; 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=jHyhjGTFKg1sMh18Rak5wL8Alzsi3N5WWbIqoYL7NzM=; b=IsulLeGmQQZr8aDyYyZ+zQRgs9olm7+7bToS1umwXDhMwShv95KS0vaZGpU/45zQur/0h9 mh5kF/R90NDuQVBTvbpg9MB2+8dNoQiecFtH0p1wg4ISL84CwNS872yp61Q8Gh2TclPKrh GW5c72WYOwTDY29q6wHj1amnQkJ+IRQKKgn2SO4SyCYRpkDrMii6tBSjttKBVkE2gFyvR4 xMjj4yG/yGLQ05DQ0SZNHAf2b3y82o+HbU3M7TsdorC6udOrM7/4HmdvwTC7Izs9B5HKeO j+jdxYCBUC29b4xK2X6LVv30J+QsxaVRHzmcH3BzsU8o2qUvM+cdAqynFlJg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026312; 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=jHyhjGTFKg1sMh18Rak5wL8Alzsi3N5WWbIqoYL7NzM=; b=nXygpekQatn8YYcR+Oz1yFgbyFYGpeoY/EESFRC4ZUYAcij4LSaxg1qBskyunE62YFUK3x FoJ13ZYoyCKCFj9gEsrtcR+X7wf1/DHSJF3qhLkHnossR63yq6SLsEYxJ+PFFBSxSpDklK aLCTeONXlbY5lyp+jLvibqCPoEB/CA0ew6ZCE6n3e/2rOzT+hnpkszd45Ww34D+nDfw3+d l1VgNr4OkUQyWj8IUdR+FnAhfcdtHCDRmPFF/+H9vsJUgLkRhaExxpxS1sd1fYpiV15giG wMGTuerOnY41dIzJj+PUL0DD9cqpLq/tZnEmEvZBUW2HEJt1lKPqQV10d9Rj7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026312; a=rsa-sha256; cv=none; b=QBlWT4ydxWIjW/QathkrpU4SoI1DwR3KEQd7Xw/H1NgIoqwHE/4EhsZUot1U2tt7tyBO6v qNiS3fdW3U0T+EEVsFHBVXQi3SYEsyPgCSMjLapouKUrA4m+K0pmkTX9Pn7wxC2G8ZDYBT iLEi/RO+QIxyyDXWx5Po6dXD1SPogFaRFq95wwQXIiADqN40580lBCqG+W9KYoYjEztUxW YgkNCogh59FTmpJk24kVsKhAYUo7gRcUk0ARZHAlkvxgPuUUF9r8M6UC97MLF6BmCXHOrq 9tWCFrOK2fxq5WDMFIdSFKyg3mcPP3Wmsz1l1QXGSKfMHHFm3G68Y5jY6HZf1A== 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 4Xbtcm4mJ3zrgf; Sun, 27 Oct 2024 10:51:52 +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 49RApqsf002331; Sun, 27 Oct 2024 10:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RApqAI002317; Sun, 27 Oct 2024 10:51:52 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:51:52 GMT Message-Id: <202410271051.49RApqAI002317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 120e685333d8 - stable/13 - libarchive: backport PR #2386 (fixes output of one test) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 120e685333d806d184bb2c7b33420c5fed6cd13e Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=120e685333d806d184bb2c7b33420c5fed6cd13e commit 120e685333d806d184bb2c7b33420c5fed6cd13e Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-27 09:43:16 +0000 libarchive: backport PR #2386 (fixes output of one test) (cherry picked from commit 6c40282284d6eab20256914648cdec39acb2c52a) --- 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);