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

sthibaul · sthibaul · commit 80448f24b50f · 2025-04-17T15:15:15.000+02:00
E.g. with

HWLOC_SYNTHETIC="group:2 group:2 pu:2" ./tests/hwloc/hwloc_type_sscanf

The presence of the two group levels makes the check for level depth fail
for the hwloc_obj_type_string case which does not expose the depth
which allows to distinguish them.

Signed-off-by: Samuel Thibault &lt;samuel.thibault@ens-lyon.org&gt;
diff --git a/tests/hwloc/hwloc_type_sscanf.c b/tests/hwloc/hwloc_type_sscanf.c
@@ -44,7 +44,7 @@ static void _check(hwloc_topology_t topology, hwloc_obj_t obj, const char *buffe
   }
 
   depth = hwloc_get_type_depth_with_attr(topology, type, &attr, sizeof(attr));
-  assert(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
`@@ -44,7 +44,7 @@ static void _check(hwloc_topology_t topology, hwloc_obj_t obj, const char *buffe`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`depth = hwloc_get_type_depth_with_attr(topology, type, &attr, sizeof(attr));`
`47`		`- assert(depth == (int) obj->depth);`
	`47`	`+ assert((depth == HWLOC_TYPE_DEPTH_MULTIPLE && !checkattrs) \|\| depth == (int) obj->depth);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`static void check(hwloc_topology_t topology, hwloc_obj_t obj)`