tests/linux/gather: ignore gp_index/obj IDs

Reading caches with opendir() from a sysdump dump can cause
cache discovery to be reordered.

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

tests/hwloc/linux/gather/test-gather-topology.sh.in

@@ -62,7 +62,11 @@ export HWLOC_FSROOT=//
 
 echo "Saving current system topology to XML..."
 # ignore DAXDevice info attr because it won't appear in save2.xml unless we pass --io to gather below
-if ! "$lstopo" --no-io -.xml | grep -v DAXDevice > "$tmpdir/save1.xml" ; then
+if ! "$lstopo" --no-io -.xml \
+    | sed   -e 's/ id="obj[0-9]*"//' \
+    | sed   -e 's/ gp_index="[0-9]*"//' \
+    | grep -v DAXDevice \
+    > "$tmpdir/save1.xml" ; then
     error "Failed"
     exit 1
 fi
@@ -85,7 +89,10 @@ export HWLOC_FSROOT="$tmpdir/save"
 rm -f "$tmpdir/save/proc/hwloc-nofile-info"
 
 echo "Saving tarball topology to XML..."
-if ! "$lstopo" --no-io "$tmpdir/save2.xml" ; then
+if ! "$lstopo" --no-io -.xml \
+    | sed   -e 's/ id="obj[0-9]*"//' \
+    | sed   -e 's/ gp_index="[0-9]*"//' \
+    > "$tmpdir/save2.xml" ; then
     error "Failed"
     exit 1
 fi