test_merge_order: add more asap libc deps
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 @@
"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 @@
"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 @@
mergelist = ['app-admin/eselect-python-20100321', '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.
+ # 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/binutils", "sys-libs/glibc"],
options = {"--complete-graph" : True},
success = True,
all_permutations = True,
- mergelist = ['sys-kernel/linux-headers-2.6.39', 'sys-libs/glibc-2.13', 'app-arch/xz-utils-5.0.2']),
+ ambiguous_merge_order = True,
+ mergelist = ['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/binutils-2.20.1')]),
)
playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)
