Merge pull request #715 from sthibaul/sscanf

bgoglin · web-flow · commit 3e82e69b7f2c · 2025-04-17T16:04:44.000+02:00
hwloc_type_sscanf: fix test when host has several levels with same type
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)`