tests: reduce length of nodeinfodata test names

Commit ddd6bef4 switched to the ustar format to fix an issue where
'make dist' fails to create a tarball because we have files with
relative names longer than 100 bytes by the time you include a
'libvirt-0.9.13' prefix.  Unfortunately, even with ustar format,
the use of 'tar -ch' tries to convert symlinks to hard links,
also with a name too long (omitting the -h works, but automake
automatically passes -h); such symlinks were added in commit
6dcf98c, which resulted in 'make dist' breaking again.  The
solution is to rename the offending symlinks to something shorter,
by shortening the entire nodeinfodata naming scheme.

* tests/nodeinfotest.c (mymain): Shorten test names.
(linuxTestNodeInfo): Accommodate new names.
* tests/nodeinfodata/*: Rename files accordingly.

447 files changed, 9 insertions, 9 deletions

diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo b/tests/nodeinfodata/linux-ppc-test1.cpuinfo
index 38f2050cf..38f2050cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo
+++ b/tests/nodeinfodata/linux-ppc-test1.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt b/tests/nodeinfodata/linux-ppc-test1.expected
index 80df8321b..80df8321b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
+++ b/tests/nodeinfodata/linux-ppc-test1.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online b/tests/nodeinfodata/linux-test1/cpu/cpu0/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_siblings
index b9ad9ed2c..b9ad9ed2c 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_siblings_list
index 8b0fab869..8b0fab869 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/thread_siblings
index d34760397..d34760397 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/thread_siblings_list
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu0/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_siblings
index b9ad9ed2c..b9ad9ed2c 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_siblings_list
index 8b0fab869..8b0fab869 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online b/tests/nodeinfodata/linux-test1/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id b/tests/nodeinfodata/linux-test1/cpu/cpu1/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu1/thread_siblings
index 0af11c552..0af11c552 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu1/thread_siblings_list
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_siblings
index b9ad9ed2c..b9ad9ed2c 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_siblings_list
index 8b0fab869..8b0fab869 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/thread_siblings
index d34760397..d34760397 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/thread_siblings_list
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test1/cpu/cpu1/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo b/tests/nodeinfodata/linux-test1/node/node0/meminfo
index ad2286a13..ad2286a13 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo
+++ b/tests/nodeinfodata/linux-test1/node/node0/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo b/tests/nodeinfodata/linux-test1/node/node1/meminfo
index 7666eb67f..7666eb67f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo
+++ b/tests/nodeinfodata/linux-test1/node/node1/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_siblings
index 176d3d66a..176d3d66a 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings_list b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_siblings_list
index 8b0fab869..8b0fab869 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/thread_siblings
index 6dcc80c76..6dcc80c76 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings_list b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/thread_siblings_list
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu0/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/online b/tests/nodeinfodata/linux-test2/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_siblings
index 176d3d66a..176d3d66a 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings_list b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_siblings_list
index 8b0fab869..8b0fab869 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/thread_siblings
index 5e249253b..5e249253b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings_list b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/thread_siblings_list
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test2/cpu/cpu1/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu0 b/tests/nodeinfodata/linux-test2/node/node0/cpu0
index c841bea28..c841bea28 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu0
+++ b/tests/nodeinfodata/linux-test2/node/node0/cpu0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu1 b/tests/nodeinfodata/linux-test2/node/node0/cpu1
index 5f4536279..5f4536279 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu1
+++ b/tests/nodeinfodata/linux-test2/node/node0/cpu1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/meminfo b/tests/nodeinfodata/linux-test2/node/node0/meminfo
index 70b0204a4..70b0204a4 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/meminfo
+++ b/tests/nodeinfodata/linux-test2/node/node0/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/possible b/tests/nodeinfodata/linux-test2/node/possible
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/possible
+++ b/tests/nodeinfodata/linux-test2/node/possible
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/thread_siblings
index 8edc2d5ec..8edc2d5ec 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/online b/tests/nodeinfodata/linux-test3/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/thread_siblings
index 063406953..063406953 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/online b/tests/nodeinfodata/linux-test3/cpu/cpu10/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu10/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/thread_siblings
index 63952a210..63952a210 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu10/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/online b/tests/nodeinfodata/linux-test3/cpu/cpu11/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu11/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/thread_siblings
index ceaaaf436..ceaaaf436 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu11/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/online b/tests/nodeinfodata/linux-test3/cpu/cpu12/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu12/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/thread_siblings
index 4154eaf1c..4154eaf1c 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu12/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/online b/tests/nodeinfodata/linux-test3/cpu/cpu13/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu13/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/thread_siblings
index b6eb26696..b6eb26696 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu13/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/online b/tests/nodeinfodata/linux-test3/cpu/cpu14/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu14/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/thread_siblings
index da4349c48..da4349c48 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu14/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/online b/tests/nodeinfodata/linux-test3/cpu/cpu15/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu15/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/thread_siblings
index 446c0dbcf..446c0dbcf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu15/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/online b/tests/nodeinfodata/linux-test3/cpu/cpu16/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu16/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/thread_siblings
index 076f20afa..076f20afa 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu16/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/online b/tests/nodeinfodata/linux-test3/cpu/cpu17/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu17/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/thread_siblings
index fe44ad04e..fe44ad04e 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu17/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/online b/tests/nodeinfodata/linux-test3/cpu/cpu18/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu18/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/thread_siblings
index dd2865ab1..dd2865ab1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu18/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/online b/tests/nodeinfodata/linux-test3/cpu/cpu19/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu19/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/thread_siblings
index 223476db7..223476db7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu19/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/online b/tests/nodeinfodata/linux-test3/cpu/cpu2/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu2/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/thread_siblings
index 56020529c..56020529c 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu2/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/online b/tests/nodeinfodata/linux-test3/cpu/cpu20/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu20/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/thread_siblings
index 1430c2a38..1430c2a38 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu20/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/online b/tests/nodeinfodata/linux-test3/cpu/cpu21/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu21/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/thread_siblings
index 61bd49752..61bd49752 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu21/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/online b/tests/nodeinfodata/linux-test3/cpu/cpu22/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu22/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/thread_siblings
index 3ec5eb3b9..3ec5eb3b9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu22/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/online b/tests/nodeinfodata/linux-test3/cpu/cpu23/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu23/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/thread_siblings
index fa274e580..fa274e580 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu23/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/online b/tests/nodeinfodata/linux-test3/cpu/cpu24/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu24/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/thread_siblings
index deb22016f..deb22016f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu24/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/online b/tests/nodeinfodata/linux-test3/cpu/cpu25/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu25/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/thread_siblings
index 74477b2f2..74477b2f2 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu25/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/online b/tests/nodeinfodata/linux-test3/cpu/cpu26/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu26/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/thread_siblings
index a2e8879e5..a2e8879e5 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu26/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/online b/tests/nodeinfodata/linux-test3/cpu/cpu27/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu27/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/thread_siblings
index e3209fc12..e3209fc12 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu27/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/online b/tests/nodeinfodata/linux-test3/cpu/cpu28/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu28/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/thread_siblings
index 9bfa3743f..9bfa3743f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu28/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/online b/tests/nodeinfodata/linux-test3/cpu/cpu29/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu29/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/thread_siblings
index b65ea83c8..b65ea83c8 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu29/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/online b/tests/nodeinfodata/linux-test3/cpu/cpu3/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu3/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/thread_siblings
index c44947f14..c44947f14 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu3/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/online b/tests/nodeinfodata/linux-test3/cpu/cpu30/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu30/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/thread_siblings
index 078ce1983..078ce1983 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu30/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/online b/tests/nodeinfodata/linux-test3/cpu/cpu31/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu31/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/thread_siblings
index b20c7d89b..b20c7d89b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu31/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/online b/tests/nodeinfodata/linux-test3/cpu/cpu32/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu32/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/thread_siblings
index 81958e478..81958e478 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu32/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/online b/tests/nodeinfodata/linux-test3/cpu/cpu33/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu33/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/thread_siblings
index 9db6e69fc..9db6e69fc 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu33/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/online b/tests/nodeinfodata/linux-test3/cpu/cpu34/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu34/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/thread_siblings
index 9a6ffb543..9a6ffb543 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu34/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/online b/tests/nodeinfodata/linux-test3/cpu/cpu35/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu35/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/thread_siblings
index 66802a0b3..66802a0b3 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu35/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/online b/tests/nodeinfodata/linux-test3/cpu/cpu36/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu36/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/thread_siblings
index b973ea5c8..b973ea5c8 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu36/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/online b/tests/nodeinfodata/linux-test3/cpu/cpu37/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu37/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/thread_siblings
index 1f7a88bf2..1f7a88bf2 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu37/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/online b/tests/nodeinfodata/linux-test3/cpu/cpu38/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu38/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/thread_siblings
index 80fff8b64..80fff8b64 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu38/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/online b/tests/nodeinfodata/linux-test3/cpu/cpu39/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu39/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/thread_siblings
index 68a532fff..68a532fff 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu39/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/online b/tests/nodeinfodata/linux-test3/cpu/cpu4/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu4/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/thread_siblings
index f3a63ad21..f3a63ad21 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu4/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/online b/tests/nodeinfodata/linux-test3/cpu/cpu40/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu40/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/thread_siblings
index 18c967879..18c967879 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu40/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/online b/tests/nodeinfodata/linux-test3/cpu/cpu41/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu41/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/thread_siblings
index a9dbc9236..a9dbc9236 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu41/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/online b/tests/nodeinfodata/linux-test3/cpu/cpu42/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu42/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/thread_siblings
index 5332d8b34..5332d8b34 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu42/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/online b/tests/nodeinfodata/linux-test3/cpu/cpu43/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu43/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/core_id
index b8626c4cf..b8626c4cf 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/thread_siblings
index 54bf8e550..54bf8e550 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu43/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/online b/tests/nodeinfodata/linux-test3/cpu/cpu44/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu44/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/thread_siblings
index 7e4fe584a..7e4fe584a 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu44/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/online b/tests/nodeinfodata/linux-test3/cpu/cpu45/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu45/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/thread_siblings
index a2ae18603..a2ae18603 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu45/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/online b/tests/nodeinfodata/linux-test3/cpu/cpu46/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu46/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/thread_siblings
index e2f5f3be9..e2f5f3be9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu46/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/online b/tests/nodeinfodata/linux-test3/cpu/cpu47/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu47/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/core_id
index 7ed6ff82d..7ed6ff82d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/thread_siblings
index 7d9f05ac7..7d9f05ac7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu47/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/online b/tests/nodeinfodata/linux-test3/cpu/cpu5/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu5/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/thread_siblings
index 88893929f..88893929f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu5/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/online b/tests/nodeinfodata/linux-test3/cpu/cpu6/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu6/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/physical_package_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/thread_siblings
index 0c52b986f..0c52b986f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu6/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/online b/tests/nodeinfodata/linux-test3/cpu/cpu7/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu7/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/thread_siblings
index 5f616f701..5f616f701 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu7/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/online b/tests/nodeinfodata/linux-test3/cpu/cpu8/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu8/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/thread_siblings
index 94eb5f460..94eb5f460 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu8/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/online b/tests/nodeinfodata/linux-test3/cpu/cpu9/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/online
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu9/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/core_id b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/core_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/physical_package_id b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/physical_package_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/thread_siblings b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/thread_siblings
index 2742e43c1..2742e43c1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test3/cpu/cpu9/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu0 b/tests/nodeinfodata/linux-test3/node/node0/cpu0
index c841bea28..c841bea28 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu0
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu12 b/tests/nodeinfodata/linux-test3/node/node0/cpu12
index 211519e8a..211519e8a 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu12
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu12
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu16 b/tests/nodeinfodata/linux-test3/node/node0/cpu16
index 445de4007..445de4007 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu16
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu16
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu20 b/tests/nodeinfodata/linux-test3/node/node0/cpu20
index a37c37082..a37c37082 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu20
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu20
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu4 b/tests/nodeinfodata/linux-test3/node/node0/cpu4
index 9e77a64eb..9e77a64eb 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu4
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu4
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu8 b/tests/nodeinfodata/linux-test3/node/node0/cpu8
index bda10cc34..bda10cc34 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu8
+++ b/tests/nodeinfodata/linux-test3/node/node0/cpu8
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/meminfo b/tests/nodeinfodata/linux-test3/node/node0/meminfo
index ec2bf5028..ec2bf5028 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node0/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu24 b/tests/nodeinfodata/linux-test3/node/node1/cpu24
index ad0a6188b..ad0a6188b 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu24
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu24
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu28 b/tests/nodeinfodata/linux-test3/node/node1/cpu28
index 83269be2b..83269be2b 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu28
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu28
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu32 b/tests/nodeinfodata/linux-test3/node/node1/cpu32
index bbca866d9..bbca866d9 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu32
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu32
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu36 b/tests/nodeinfodata/linux-test3/node/node1/cpu36
index 5e53f7054..5e53f7054 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu36
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu36
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu40 b/tests/nodeinfodata/linux-test3/node/node1/cpu40
index c727d468b..c727d468b 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu40
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu40
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu44 b/tests/nodeinfodata/linux-test3/node/node1/cpu44
index 859e4fcfa..859e4fcfa 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu44
+++ b/tests/nodeinfodata/linux-test3/node/node1/cpu44
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/meminfo b/tests/nodeinfodata/linux-test3/node/node1/meminfo
index f84bd4c50..f84bd4c50 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node1/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu11 b/tests/nodeinfodata/linux-test3/node/node2/cpu11
index e29d89828..e29d89828 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu11
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu11
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu15 b/tests/nodeinfodata/linux-test3/node/node2/cpu15
index e905d85e4..e905d85e4 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu15
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu15
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu19 b/tests/nodeinfodata/linux-test3/node/node2/cpu19
index c671083eb..c671083eb 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu19
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu19
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu23 b/tests/nodeinfodata/linux-test3/node/node2/cpu23
index 75c2f5774..75c2f5774 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu23
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu23
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu3 b/tests/nodeinfodata/linux-test3/node/node2/cpu3
index c7690e5aa..c7690e5aa 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu3
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu3
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu7 b/tests/nodeinfodata/linux-test3/node/node2/cpu7
index 09e3f79b4..09e3f79b4 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu7
+++ b/tests/nodeinfodata/linux-test3/node/node2/cpu7
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/meminfo b/tests/nodeinfodata/linux-test3/node/node2/meminfo
index c755e485e..c755e485e 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node2/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu27 b/tests/nodeinfodata/linux-test3/node/node3/cpu27
index 74ced19c1..74ced19c1 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu27
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu27
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu31 b/tests/nodeinfodata/linux-test3/node/node3/cpu31
index 6a9a56961..6a9a56961 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu31
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu31
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu35 b/tests/nodeinfodata/linux-test3/node/node3/cpu35
index 47654d6e1..47654d6e1 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu35
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu35
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu39 b/tests/nodeinfodata/linux-test3/node/node3/cpu39
index d46548047..d46548047 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu39
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu39
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu43 b/tests/nodeinfodata/linux-test3/node/node3/cpu43
index 03b2d2d0a..03b2d2d0a 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu43
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu43
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu47 b/tests/nodeinfodata/linux-test3/node/node3/cpu47
index 19407d4d6..19407d4d6 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu47
+++ b/tests/nodeinfodata/linux-test3/node/node3/cpu47
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/meminfo b/tests/nodeinfodata/linux-test3/node/node3/meminfo
index b5809443d..b5809443d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node3/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu10 b/tests/nodeinfodata/linux-test3/node/node4/cpu10
index a6dc6bb10..a6dc6bb10 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu10
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu10
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu14 b/tests/nodeinfodata/linux-test3/node/node4/cpu14
index 24cb3b456..24cb3b456 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu14
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu14
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu18 b/tests/nodeinfodata/linux-test3/node/node4/cpu18
index 3809adc56..3809adc56 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu18
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu18
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu2 b/tests/nodeinfodata/linux-test3/node/node4/cpu2
index 2dcca332c..2dcca332c 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu2
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu2
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu22 b/tests/nodeinfodata/linux-test3/node/node4/cpu22
index 2c226ae53..2c226ae53 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu22
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu22
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu6 b/tests/nodeinfodata/linux-test3/node/node4/cpu6
index 2e7576354..2e7576354 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu6
+++ b/tests/nodeinfodata/linux-test3/node/node4/cpu6
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/meminfo b/tests/nodeinfodata/linux-test3/node/node4/meminfo
index 8ad9b864d..8ad9b864d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node4/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu26 b/tests/nodeinfodata/linux-test3/node/node5/cpu26
index 1dd180f15..1dd180f15 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu26
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu26
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu30 b/tests/nodeinfodata/linux-test3/node/node5/cpu30
index 80226fa99..80226fa99 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu30
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu30
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu34 b/tests/nodeinfodata/linux-test3/node/node5/cpu34
index 0c0e73891..0c0e73891 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu34
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu34
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu38 b/tests/nodeinfodata/linux-test3/node/node5/cpu38
index 7231eb460..7231eb460 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu38
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu38
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu42 b/tests/nodeinfodata/linux-test3/node/node5/cpu42
index 8ebd18e6f..8ebd18e6f 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu42
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu42
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu46 b/tests/nodeinfodata/linux-test3/node/node5/cpu46
index 55223e084..55223e084 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu46
+++ b/tests/nodeinfodata/linux-test3/node/node5/cpu46
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/meminfo b/tests/nodeinfodata/linux-test3/node/node5/meminfo
index fb93073e8..fb93073e8 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node5/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu1 b/tests/nodeinfodata/linux-test3/node/node6/cpu1
index 5f4536279..5f4536279 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu1
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu13 b/tests/nodeinfodata/linux-test3/node/node6/cpu13
index 52d3b6970..52d3b6970 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu13
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu13
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu17 b/tests/nodeinfodata/linux-test3/node/node6/cpu17
index 13929dbfa..13929dbfa 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu17
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu17
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu21 b/tests/nodeinfodata/linux-test3/node/node6/cpu21
index 68a7cad5a..68a7cad5a 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu21
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu21
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu5 b/tests/nodeinfodata/linux-test3/node/node6/cpu5
index cc07c3b97..cc07c3b97 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu5
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu5
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu9 b/tests/nodeinfodata/linux-test3/node/node6/cpu9
index 1ec1db255..1ec1db255 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu9
+++ b/tests/nodeinfodata/linux-test3/node/node6/cpu9
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/meminfo b/tests/nodeinfodata/linux-test3/node/node6/meminfo
index d4fa1d080..d4fa1d080 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node6/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu25 b/tests/nodeinfodata/linux-test3/node/node7/cpu25
index 3145742e9..3145742e9 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu25
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu25
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu29 b/tests/nodeinfodata/linux-test3/node/node7/cpu29
index fa37dc698..fa37dc698 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu29
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu29
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu33 b/tests/nodeinfodata/linux-test3/node/node7/cpu33
index b7a9f8d24..b7a9f8d24 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu33
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu33
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu37 b/tests/nodeinfodata/linux-test3/node/node7/cpu37
index 41b4ce7bb..41b4ce7bb 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu37
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu37
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu41 b/tests/nodeinfodata/linux-test3/node/node7/cpu41
index cc0b78cb6..cc0b78cb6 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu41
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu41
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu45 b/tests/nodeinfodata/linux-test3/node/node7/cpu45
index 58c3ca303..58c3ca303 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu45
+++ b/tests/nodeinfodata/linux-test3/node/node7/cpu45
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/meminfo b/tests/nodeinfodata/linux-test3/node/node7/meminfo
index 4f43eae48..4f43eae48 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/meminfo
+++ b/tests/nodeinfodata/linux-test3/node/node7/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/possible b/tests/nodeinfodata/linux-test3/node/possible
index 21408fdea..21408fdea 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/possible
+++ b/tests/nodeinfodata/linux-test3/node/possible
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/thread_siblings
index 635047563..635047563 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/online b/tests/nodeinfodata/linux-test4/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/thread_siblings
index 5fca1fda0..5fca1fda0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/online b/tests/nodeinfodata/linux-test4/cpu/cpu10/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu10/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/core_id
index 45a4fb75d..45a4fb75d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/thread_siblings
index cde5dce24..cde5dce24 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu10/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/online b/tests/nodeinfodata/linux-test4/cpu/cpu11/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu11/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/core_id
index ec635144f..ec635144f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/thread_siblings
index 54c33716d..54c33716d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu11/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/online b/tests/nodeinfodata/linux-test4/cpu/cpu12/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu12/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/core_id
index b6a7d89c6..b6a7d89c6 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/thread_siblings
index 83b33d238..83b33d238 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu12/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/online b/tests/nodeinfodata/linux-test4/cpu/cpu13/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu13/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/core_id
index 98d9bcb75..98d9bcb75 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/thread_siblings
index 8bd1af11b..8bd1af11b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu13/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/online b/tests/nodeinfodata/linux-test4/cpu/cpu14/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu14/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/core_id
index 3c032078a..3c032078a 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/thread_siblings
index 26a4dd33f..26a4dd33f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu14/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/online b/tests/nodeinfodata/linux-test4/cpu/cpu15/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu15/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/core_id
index 7273c0fa8..7273c0fa8 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/thread_siblings
index e002b3628..e002b3628 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu15/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/online b/tests/nodeinfodata/linux-test4/cpu/cpu2/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu2/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/core_id
index 45a4fb75d..45a4fb75d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/thread_siblings
index e22438191..e22438191 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu2/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/online b/tests/nodeinfodata/linux-test4/cpu/cpu3/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu3/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/core_id
index ec635144f..ec635144f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/thread_siblings
index be15c71fd..be15c71fd 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu3/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/online b/tests/nodeinfodata/linux-test4/cpu/cpu4/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu4/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/core_id
index b6a7d89c6..b6a7d89c6 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/thread_siblings
index 66375d500..66375d500 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu4/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/online b/tests/nodeinfodata/linux-test4/cpu/cpu5/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu5/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/core_id
index 98d9bcb75..98d9bcb75 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/thread_siblings
index 0bfe0202e..0bfe0202e 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu5/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/online b/tests/nodeinfodata/linux-test4/cpu/cpu6/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu6/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/core_id
index 3c032078a..3c032078a 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/thread_siblings
index b5fda7b22..b5fda7b22 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu6/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/online b/tests/nodeinfodata/linux-test4/cpu/cpu7/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu7/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/core_id
index a45fd52cc..a45fd52cc 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/thread_siblings
index d46f19798..d46f19798 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu7/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/online b/tests/nodeinfodata/linux-test4/cpu/cpu8/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu8/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/thread_siblings
index e199843fc..e199843fc 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu8/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/online b/tests/nodeinfodata/linux-test4/cpu/cpu9/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/online
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu9/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/core_id b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/core_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/physical_package_id b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/physical_package_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/thread_siblings b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/thread_siblings
index 092ce5f32..092ce5f32 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test4/cpu/cpu9/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu0 b/tests/nodeinfodata/linux-test4/node/node0/cpu0
index c841bea28..c841bea28 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu0
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu1 b/tests/nodeinfodata/linux-test4/node/node0/cpu1
index 5f4536279..5f4536279 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu1
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu2 b/tests/nodeinfodata/linux-test4/node/node0/cpu2
index 2dcca332c..2dcca332c 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu2
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu2
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu3 b/tests/nodeinfodata/linux-test4/node/node0/cpu3
index c7690e5aa..c7690e5aa 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu3
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu3
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu4 b/tests/nodeinfodata/linux-test4/node/node0/cpu4
index 9e77a64eb..9e77a64eb 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu4
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu4
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu5 b/tests/nodeinfodata/linux-test4/node/node0/cpu5
index cc07c3b97..cc07c3b97 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu5
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu5
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu6 b/tests/nodeinfodata/linux-test4/node/node0/cpu6
index 2e7576354..2e7576354 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu6
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu6
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu7 b/tests/nodeinfodata/linux-test4/node/node0/cpu7
index 09e3f79b4..09e3f79b4 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu7
+++ b/tests/nodeinfodata/linux-test4/node/node0/cpu7
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/meminfo b/tests/nodeinfodata/linux-test4/node/node0/meminfo
index c74a37227..c74a37227 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/meminfo
+++ b/tests/nodeinfodata/linux-test4/node/node0/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu10 b/tests/nodeinfodata/linux-test4/node/node1/cpu10
index a6dc6bb10..a6dc6bb10 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu10
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu10
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu11 b/tests/nodeinfodata/linux-test4/node/node1/cpu11
index e29d89828..e29d89828 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu11
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu11
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu12 b/tests/nodeinfodata/linux-test4/node/node1/cpu12
index 211519e8a..211519e8a 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu12
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu12
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu13 b/tests/nodeinfodata/linux-test4/node/node1/cpu13
index 52d3b6970..52d3b6970 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu13
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu13
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu14 b/tests/nodeinfodata/linux-test4/node/node1/cpu14
index 24cb3b456..24cb3b456 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu14
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu14
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu15 b/tests/nodeinfodata/linux-test4/node/node1/cpu15
index e905d85e4..e905d85e4 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu15
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu15
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu8 b/tests/nodeinfodata/linux-test4/node/node1/cpu8
index bda10cc34..bda10cc34 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu8
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu8
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu9 b/tests/nodeinfodata/linux-test4/node/node1/cpu9
index 1ec1db255..1ec1db255 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu9
+++ b/tests/nodeinfodata/linux-test4/node/node1/cpu9
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/meminfo b/tests/nodeinfodata/linux-test4/node/node1/meminfo
index 1f59f1947..1f59f1947 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/meminfo
+++ b/tests/nodeinfodata/linux-test4/node/node1/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/possible b/tests/nodeinfodata/linux-test4/node/possible
index 138b411f2..138b411f2 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/possible
+++ b/tests/nodeinfodata/linux-test4/node/possible
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_siblings
index 96a53c740..96a53c740 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_siblings_list
index 40c7bb2f1..40c7bb2f1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/thread_siblings
index 635047563..635047563 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/thread_siblings_list
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu0/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/online b/tests/nodeinfodata/linux-test5/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_id
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_siblings
index 96a53c740..96a53c740 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_siblings_list
index 40c7bb2f1..40c7bb2f1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/thread_siblings
index 5fca1fda0..5fca1fda0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/thread_siblings_list
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu1/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/online b/tests/nodeinfodata/linux-test5/cpu/cpu2/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/online
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_siblings
index 96a53c740..96a53c740 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_siblings_list
index 40c7bb2f1..40c7bb2f1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/thread_siblings
index e22438191..e22438191 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/thread_siblings_list
index 0cfbf0888..0cfbf0888 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu2/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/online b/tests/nodeinfodata/linux-test5/cpu/cpu3/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/online
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_id
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_siblings
index 96a53c740..96a53c740 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_siblings_list
index 40c7bb2f1..40c7bb2f1 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/core_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/thread_siblings
index be15c71fd..be15c71fd 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings_list b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/thread_siblings_list
index 00750edc0..00750edc0 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings_list
+++ b/tests/nodeinfodata/linux-test5/cpu/cpu3/topology/thread_siblings_list
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/thread_siblings
index b4de39476..b4de39476 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu0/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online b/tests/nodeinfodata/linux-test6/cpu/cpu1/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu1/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/core_id
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/thread_siblings
index 9e22bcb8e..9e22bcb8e 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu1/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online b/tests/nodeinfodata/linux-test6/cpu/cpu2/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu2/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/core_id
index ec635144f..ec635144f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/thread_siblings
index c739b42c4..c739b42c4 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu2/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online b/tests/nodeinfodata/linux-test6/cpu/cpu3/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu3/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/core_id
index f599e28b8..f599e28b8 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/thread_siblings
index adb9de8ee..adb9de8ee 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu3/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online b/tests/nodeinfodata/linux-test6/cpu/cpu4/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu4/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/core_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/thread_siblings
index b4de39476..b4de39476 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu4/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online b/tests/nodeinfodata/linux-test6/cpu/cpu5/online
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu5/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online b/tests/nodeinfodata/linux-test6/cpu/cpu6/online
index d00491fd7..d00491fd7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu6/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/core_id
index ec635144f..ec635144f 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/core_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/physical_package_id
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/physical_package_id
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/thread_siblings
index c739b42c4..c739b42c4 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu6/topology/thread_siblings
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online b/tests/nodeinfodata/linux-test6/cpu/cpu7/online
index 573541ac9..573541ac9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online
+++ b/tests/nodeinfodata/linux-test6/cpu/cpu7/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0 b/tests/nodeinfodata/linux-test6/node/node0/cpu0
index c841bea28..c841bea28 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1 b/tests/nodeinfodata/linux-test6/node/node0/cpu1
index 5f4536279..5f4536279 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2 b/tests/nodeinfodata/linux-test6/node/node0/cpu2
index 2dcca332c..2dcca332c 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu2
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3 b/tests/nodeinfodata/linux-test6/node/node0/cpu3
index c7690e5aa..c7690e5aa 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu3
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4 b/tests/nodeinfodata/linux-test6/node/node0/cpu4
index 9e77a64eb..9e77a64eb 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu4
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5 b/tests/nodeinfodata/linux-test6/node/node0/cpu5
index cc07c3b97..cc07c3b97 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu5
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6 b/tests/nodeinfodata/linux-test6/node/node0/cpu6
index 2e7576354..2e7576354 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu6
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7 b/tests/nodeinfodata/linux-test6/node/node0/cpu7
index 09e3f79b4..09e3f79b4 120000
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7
+++ b/tests/nodeinfodata/linux-test6/node/node0/cpu7
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo b/tests/nodeinfodata/linux-test6/node/node0/meminfo
index 8122d41b9..8122d41b9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo
+++ b/tests/nodeinfodata/linux-test6/node/node0/meminfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online b/tests/nodeinfodata/linux-test6/node/online
index c1da2e294..c1da2e294 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online
+++ b/tests/nodeinfodata/linux-test6/node/online
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible b/tests/nodeinfodata/linux-test6/node/possible
index c1da2e294..c1da2e294 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible
+++ b/tests/nodeinfodata/linux-test6/node/possible
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test1.cpuinfo
index e88a48ff3..e88a48ff3 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test1.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test1.expected
index 4c868244d..4c868244d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test1.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test2.cpuinfo
index ac9ce6332..ac9ce6332 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test2.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test2.expected
index 33bfbf3e4..33bfbf3e4 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test2.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test3.cpuinfo
index f3fbf4b5d..f3fbf4b5d 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test3.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test3.expected
index 0306f86d7..0306f86d7 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test3.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test4.cpuinfo
index b3c33b3c9..b3c33b3c9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test4.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test4.expected
index 0c8f9567e..0c8f9567e 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test4.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test5.cpuinfo
index 0c3fbe834..0c3fbe834 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test5.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test5.expected
index e63cf76c9..e63cf76c9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test5.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test6.cpuinfo
index 61838ddee..61838ddee 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
+++ b/tests/nodeinfodata/linux-x86-test6.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test6.expected
index 7ffcb8e04..7ffcb8e04 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-x86-test6.expected
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 851acd069..c44cc8afc 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data)
     if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
                     abs_srcdir, test) < 0 ||
         virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
-                    abs_srcdir, test, arch) < 0 ||
-        virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt",
-                    abs_srcdir, test, arch) < 0) {
+                    abs_srcdir, arch, test) < 0 ||
+        virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
+                    abs_srcdir, arch, test) < 0) {
         goto cleanup;
     }
 
@@ -123,14 +123,14 @@ mymain(void)
     int ret = 0;
     int i;
     const char *nodeData[] = {
-        "nodeinfo-sysfs-test-1",
+        "test1",
 # if !(defined(__powerpc__) ||                  \
        defined(__powerpc64__))
-        "nodeinfo-sysfs-test-2",
-        "nodeinfo-sysfs-test-3",
-        "nodeinfo-sysfs-test-4",
-        "nodeinfo-sysfs-test-5",
-        "nodeinfo-sysfs-test-6",
+        "test2",
+        "test3",
+        "test4",
+        "test5",
+        "test6",
 # endif
     };