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 1QOOB5-0004Nf-Vb for garchives@archives.gentoo.org; Mon, 23 May 2011 05:59:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 026541C005; Mon, 23 May 2011 05:59:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A8B931C005 for ; Mon, 23 May 2011 05:59:35 +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 220A81B4020 for ; Mon, 23 May 2011 05:59:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2DAAC80505 for ; Mon, 23 May 2011 05:59:34 +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: <83e979f8e6bacc611e3e6b6b09142572b0df70d8.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: 83e979f8e6bacc611e3e6b6b09142572b0df70d8 Date: Mon, 23 May 2011 05:59:34 +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: 6cb9f52e8121fcb6c1abf04b6e20aad4 commit: 83e979f8e6bacc611e3e6b6b09142572b0df70d8 Author: Zac Medico gentoo org> AuthorDate: Mon May 23 05:59:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 23 05:59:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D83e979f8 test_merge_order: add more asap libc deps --- pym/portage/tests/resolver/test_merge_order.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 1057300..ba3d9b4 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -126,12 +126,15 @@ class MergeOrderTestCase(TestCase): "virtual/libc-0" : { "RDEPEND" : "sys-libs/glibc", }, + "sys-devel/gcc-4.5.2" : {}, + "sys-devel/binutils-2.18" : {}, + "sys-devel/binutils-2.20.1" : {}, "sys-libs/glibc-2.11" : { - "DEPEND" : "virtual/os-headers", + "DEPEND" : "virtual/os-headers sys-devel/gcc sys-devel/binutils", "RDEPEND": "", }, "sys-libs/glibc-2.13" : { - "DEPEND" : "virtual/os-headers", + "DEPEND" : "virtual/os-headers sys-devel/gcc sys-devel/binutils", "RDEPEND": "", }, "virtual/os-headers-0" : { @@ -185,8 +188,9 @@ class MergeOrderTestCase(TestCase): "virtual/libc-0" : { "RDEPEND" : "sys-libs/glibc", }, + "sys-devel/binutils-2.18" : {}, "sys-libs/glibc-2.11" : { - "DEPEND" : "virtual/os-headers", + "DEPEND" : "virtual/os-headers sys-devel/gcc sys-devel/binutils", "RDEPEND": "", }, "virtual/os-headers-0" : { @@ -329,13 +333,15 @@ class MergeOrderTestCase(TestCase): mergelist =3D ['app-admin/eselect-python-20100321', 'sys-apps/portag= e-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. + # dependencies. See bug #303567. Optimally, satisfied deps + # are always merged after the asap nodes that depend on them. ResolverPlaygroundTestCase( - ["app-arch/xz-utils", "sys-kernel/linux-headers", "sys-libs/glibc"], + ["app-arch/xz-utils", "sys-kernel/linux-headers", "sys-devel/binutil= s", "sys-libs/glibc"], options =3D {"--complete-graph" : True}, success =3D True, all_permutations =3D True, - mergelist =3D ['sys-kernel/linux-headers-2.6.39', 'sys-libs/glibc-2.= 13', 'app-arch/xz-utils-5.0.2']), + ambiguous_merge_order =3D True, + mergelist =3D ['sys-kernel/linux-headers-2.6.39', 'sys-devel/gcc-4.5= .2', 'sys-libs/glibc-2.13', ('app-arch/xz-utils-5.0.2', 'sys-devel/binuti= ls-2.20.1')]), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled)