From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FDDE138334 for ; Fri, 3 Jan 2020 12:45:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BA47E08E5; Fri, 3 Jan 2020 12:45:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2ECB2E08E5 for ; Fri, 3 Jan 2020 12:45:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 276EA34DB84 for ; Fri, 3 Jan 2020 12:45:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D388FA9 for ; Fri, 3 Jan 2020 12:45:05 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1578055429.4d6b231cf0973e1d3b869d98a0e263155f04b20c.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/qmerge/ X-VCS-Repository: proj/portage-utils X-VCS-Files: tests/qmerge/dotest X-VCS-Directories: tests/qmerge/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 4d6b231cf0973e1d3b869d98a0e263155f04b20c X-VCS-Branch: master Date: Fri, 3 Jan 2020 12:45:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6ee5314-7afd-49cf-b0cf-19758ee64e5a X-Archives-Hash: d155ae6f2f8725cff568ae9a05233905 commit: 4d6b231cf0973e1d3b869d98a0e263155f04b20c Author: Fabian Groffen gentoo org> AuthorDate: Fri Jan 3 12:43:49 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jan 3 12:43:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4d6b231c tests/qmerge: test masking an intermediate level in INSTALL_MASK this tests the case from the archives: /usr/foo -/usr/foo/bar /usr/foo/bar/baz Bug: https://bugs.gentoo.org/699376 Signed-off-by: Fabian Groffen gentoo.org> tests/qmerge/dotest | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest index 1bbf5f7..208bc3b 100755 --- a/tests/qmerge/dotest +++ b/tests/qmerge/dotest @@ -118,6 +118,18 @@ tend $? "qmerge-test: [M] uninstall" || die "${out}" [[ ! -e ${ROOT}/usr/bin/dummy ]] tend $? "qmerge-test: [M] /usr/bin/dummy removed" || die "$(treedir "${ROOT}")" +export INSTALL_MASK="/usr -/usr/bin /usr/bin/dummy" +out=$(yes | qmerge -F qmerge-test) +tend $? "qmerge-test: [M] install except /usr/bin/dummy" || die "${out}" +[[ ! -e ${ROOT}/usr/bin/dummy ]] +tend $? "qmerge-test: [M] found no /usr/bin/dummy" || die "$(treedir "${ROOT}")" +[[ -e ${ROOT}/usr/bin/qmerge-test ]] +tend $? "qmerge-test: [M] found /usr/bin/qmerge-test" || die "$(treedir "${ROOT}")" + +out=$(yes | qmerge -FU qmerge-test) +tend $? "qmerge-test: [M] uninstall" || die "${out}" +[[ ! -e ${ROOT}/usr/bin/qmerge-test ]] +tend $? "qmerge-test: [M] /usr/bin/qmerge-test removed" || die "$(treedir "${ROOT}")" set -e cleantmpdir