hwloc_type_sscanf: fix test when host has several levels with same type

sthibaul · sthibaul · commit ac0cf845a064 · 2025-04-17T16:08:22.000+02:00
This refines 26e6be0 ("hwloc_type_sscanf: fix test when host has several levels with same type") to still check against HWLOC_TYPE_DEPTH_MULTIPLE when we have the object depth that should be enough to disambiguate levels. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> (cherry picked from commit 80448f2)
diff --git a/tests/hwloc/hwloc_type_sscanf.c b/tests/hwloc/hwloc_type_sscanf.c
@@ -37,7 +37,7 @@ static void _check(hwloc_topology_t topology, hwloc_obj_t obj, const char *buffe
 
   err = hwloc_type_sscanf_as_depth(buffer, NULL, topology, &depth);
   assert(!err);
-  assert(depth == HWLOC_TYPE_DEPTH_MULTIPLE || depth == (int) obj->depth);
+  assert((depth == HWLOC_TYPE_DEPTH_MULTIPLE && !checkattrs) || depth == (int) obj->depth);
 }
 
 static void check(hwloc_topology_t topology, hwloc_obj_t obj)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static void _check(hwloc_topology_t topology, hwloc_obj_t obj, const char *buffe`
`37`	`37`
`38`	`38`	`err = hwloc_type_sscanf_as_depth(buffer, NULL, topology, &depth);`
`39`	`39`	`assert(!err);`
`40`		`- assert(depth == HWLOC_TYPE_DEPTH_MULTIPLE \|\| depth == (int) obj->depth);`
	`40`	`+ assert((depth == HWLOC_TYPE_DEPTH_MULTIPLE && !checkattrs) \|\| depth == (int) obj->depth);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static void check(hwloc_topology_t topology, hwloc_obj_t obj)`