From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOGis-0004zI-T9 for garchives@archives.gentoo.org; Sun, 22 May 2011 22:02:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30D191C080; Sun, 22 May 2011 22:01:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D4B211C080 for ; Sun, 22 May 2011 22:01:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5703C1B401E for ; Sun, 22 May 2011 22:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5363A80506 for ; Sun, 22 May 2011 22:01:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <666fe9ab262e0c1307eeecc08e204966aefdf0c0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 666fe9ab262e0c1307eeecc08e204966aefdf0c0 Date: Sun, 22 May 2011 22:01:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 89c96cfcaa670b2bd996e0098ae3b51c commit: 666fe9ab262e0c1307eeecc08e204966aefdf0c0 Author: Zac Medico gentoo org> AuthorDate: Sun May 22 22:01:21 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 22 22:01:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D666fe9ab test_merge_order: test asap LIBC_PACKAGE_ATOM --- pym/portage/tests/resolver/test_merge_order.py | 44 ++++++++++++++++++= ++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 2a4dbc3..1b7cddd 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -122,6 +122,26 @@ class MergeOrderTestCase(TestCase): }, "dev-lang/python-3.1" : {}, "dev-lang/python-3.2" : {}, + "virtual/libc-0" : { + "RDEPEND" : "sys-libs/glibc", + }, + "sys-libs/glibc-2.11" : { + "DEPEND" : "virtual/os-headers", + }, + "sys-libs/glibc-2.13" : { + "DEPEND" : "virtual/os-headers", + }, + "virtual/os-headers-0" : { + "RDEPEND" : "sys-kernel/linux-headers", + }, + "sys-kernel/linux-headers-2.6.38": { + "DEPEND" : "app-arch/xz-utils", + }, + "sys-kernel/linux-headers-2.6.39": { + "DEPEND" : "app-arch/xz-utils", + }, + "app-arch/xz-utils-5.0.1" : {}, + "app-arch/xz-utils-5.0.2" : {}, } =20 installed =3D { @@ -157,6 +177,19 @@ class MergeOrderTestCase(TestCase): "RDEPEND" : "dev-lang/python", }, "dev-lang/python-3.1" : {}, + "virtual/libc-0" : { + "RDEPEND" : "sys-libs/glibc", + }, + "sys-libs/glibc-2.11" : { + "DEPEND" : "virtual/os-headers", + }, + "virtual/os-headers-0" : { + "RDEPEND" : "sys-kernel/linux-headers", + }, + "sys-kernel/linux-headers-2.6.38": { + "DEPEND" : "app-arch/xz-utils", + }, + "app-arch/xz-utils-5.0.1" : {}, } =20 test_cases =3D ( @@ -285,6 +318,17 @@ class MergeOrderTestCase(TestCase): success =3D True, all_permutations =3D True, mergelist =3D ['sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), + # Test that OS_HEADERS_PACKAGE_ATOM and LIBC_PACKAGE_ATOM + # are merged asap, in order to account for implicit + # dependencies. See bug #303567. + # TODO: optimize this to ensure that glibc comes before xz-utils + ResolverPlaygroundTestCase( + ["app-arch/xz-utils", "sys-kernel/linux-headers", "sys-libs/glibc"], + options =3D {"--complete-graph" : True}, + success =3D True, + all_permutations =3D True, + ambiguous_merge_order =3D True, + mergelist =3D ['sys-kernel/linux-headers-2.6.39', ('app-arch/xz-util= s-5.0.2', 'sys-libs/glibc-2.13')]), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled)