From df80282dab2c0d17880d06fd98018fa3c5093d07 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Fri, 20 Jul 2012 13:12:44 -0600
Subject: [PATCH] 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.
---
 ...-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} |   0
 ...pc-output.txt => linux-ppc-test1.expected} |   0
 .../cpu/cpu0/online                           |   0
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/core_siblings           |   0
 .../cpu/cpu0/topology/core_siblings_list      |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu0/topology/thread_siblings_list    |   0
 .../cpu/cpu1/core_id                          |   0
 .../cpu/cpu1/core_siblings                    |   0
 .../cpu/cpu1/core_siblings_list               |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/physical_package_id              |   0
 .../cpu/cpu1/thread_siblings                  |   0
 .../cpu/cpu1/thread_siblings_list             |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/core_siblings           |   0
 .../cpu/cpu1/topology/core_siblings_list      |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu1/topology/thread_siblings_list    |   0
 .../node/node0/meminfo                        |   0
 .../node/node1/meminfo                        |   0
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/core_siblings           |   0
 .../cpu/cpu0/topology/core_siblings_list      |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu0/topology/thread_siblings_list    |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/core_siblings           |   0
 .../cpu/cpu1/topology/core_siblings_list      |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu1/topology/thread_siblings_list    |   0
 .../node/node0/cpu0                           |   0
 .../node/node0/cpu1                           |   0
 .../node/node0/meminfo                        |   0
 .../node/possible                             |   0
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu10/online                          |   0
 .../cpu/cpu10/topology/core_id                |   0
 .../cpu/cpu10/topology/physical_package_id    |   0
 .../cpu/cpu10/topology/thread_siblings        |   0
 .../cpu/cpu11/online                          |   0
 .../cpu/cpu11/topology/core_id                |   0
 .../cpu/cpu11/topology/physical_package_id    |   0
 .../cpu/cpu11/topology/thread_siblings        |   0
 .../cpu/cpu12/online                          |   0
 .../cpu/cpu12/topology/core_id                |   0
 .../cpu/cpu12/topology/physical_package_id    |   0
 .../cpu/cpu12/topology/thread_siblings        |   0
 .../cpu/cpu13/online                          |   0
 .../cpu/cpu13/topology/core_id                |   0
 .../cpu/cpu13/topology/physical_package_id    |   0
 .../cpu/cpu13/topology/thread_siblings        |   0
 .../cpu/cpu14/online                          |   0
 .../cpu/cpu14/topology/core_id                |   0
 .../cpu/cpu14/topology/physical_package_id    |   0
 .../cpu/cpu14/topology/thread_siblings        |   0
 .../cpu/cpu15/online                          |   0
 .../cpu/cpu15/topology/core_id                |   0
 .../cpu/cpu15/topology/physical_package_id    |   0
 .../cpu/cpu15/topology/thread_siblings        |   0
 .../cpu/cpu16/online                          |   0
 .../cpu/cpu16/topology/core_id                |   0
 .../cpu/cpu16/topology/physical_package_id    |   0
 .../cpu/cpu16/topology/thread_siblings        |   0
 .../cpu/cpu17/online                          |   0
 .../cpu/cpu17/topology/core_id                |   0
 .../cpu/cpu17/topology/physical_package_id    |   0
 .../cpu/cpu17/topology/thread_siblings        |   0
 .../cpu/cpu18/online                          |   0
 .../cpu/cpu18/topology/core_id                |   0
 .../cpu/cpu18/topology/physical_package_id    |   0
 .../cpu/cpu18/topology/thread_siblings        |   0
 .../cpu/cpu19/online                          |   0
 .../cpu/cpu19/topology/core_id                |   0
 .../cpu/cpu19/topology/physical_package_id    |   0
 .../cpu/cpu19/topology/thread_siblings        |   0
 .../cpu/cpu2/online                           |   0
 .../cpu/cpu2/topology/core_id                 |   0
 .../cpu/cpu2/topology/physical_package_id     |   0
 .../cpu/cpu2/topology/thread_siblings         |   0
 .../cpu/cpu20/online                          |   0
 .../cpu/cpu20/topology/core_id                |   0
 .../cpu/cpu20/topology/physical_package_id    |   0
 .../cpu/cpu20/topology/thread_siblings        |   0
 .../cpu/cpu21/online                          |   0
 .../cpu/cpu21/topology/core_id                |   0
 .../cpu/cpu21/topology/physical_package_id    |   0
 .../cpu/cpu21/topology/thread_siblings        |   0
 .../cpu/cpu22/online                          |   0
 .../cpu/cpu22/topology/core_id                |   0
 .../cpu/cpu22/topology/physical_package_id    |   0
 .../cpu/cpu22/topology/thread_siblings        |   0
 .../cpu/cpu23/online                          |   0
 .../cpu/cpu23/topology/core_id                |   0
 .../cpu/cpu23/topology/physical_package_id    |   0
 .../cpu/cpu23/topology/thread_siblings        |   0
 .../cpu/cpu24/online                          |   0
 .../cpu/cpu24/topology/core_id                |   0
 .../cpu/cpu24/topology/physical_package_id    |   0
 .../cpu/cpu24/topology/thread_siblings        |   0
 .../cpu/cpu25/online                          |   0
 .../cpu/cpu25/topology/core_id                |   0
 .../cpu/cpu25/topology/physical_package_id    |   0
 .../cpu/cpu25/topology/thread_siblings        |   0
 .../cpu/cpu26/online                          |   0
 .../cpu/cpu26/topology/core_id                |   0
 .../cpu/cpu26/topology/physical_package_id    |   0
 .../cpu/cpu26/topology/thread_siblings        |   0
 .../cpu/cpu27/online                          |   0
 .../cpu/cpu27/topology/core_id                |   0
 .../cpu/cpu27/topology/physical_package_id    |   0
 .../cpu/cpu27/topology/thread_siblings        |   0
 .../cpu/cpu28/online                          |   0
 .../cpu/cpu28/topology/core_id                |   0
 .../cpu/cpu28/topology/physical_package_id    |   0
 .../cpu/cpu28/topology/thread_siblings        |   0
 .../cpu/cpu29/online                          |   0
 .../cpu/cpu29/topology/core_id                |   0
 .../cpu/cpu29/topology/physical_package_id    |   0
 .../cpu/cpu29/topology/thread_siblings        |   0
 .../cpu/cpu3/online                           |   0
 .../cpu/cpu3/topology/core_id                 |   0
 .../cpu/cpu3/topology/physical_package_id     |   0
 .../cpu/cpu3/topology/thread_siblings         |   0
 .../cpu/cpu30/online                          |   0
 .../cpu/cpu30/topology/core_id                |   0
 .../cpu/cpu30/topology/physical_package_id    |   0
 .../cpu/cpu30/topology/thread_siblings        |   0
 .../cpu/cpu31/online                          |   0
 .../cpu/cpu31/topology/core_id                |   0
 .../cpu/cpu31/topology/physical_package_id    |   0
 .../cpu/cpu31/topology/thread_siblings        |   0
 .../cpu/cpu32/online                          |   0
 .../cpu/cpu32/topology/core_id                |   0
 .../cpu/cpu32/topology/physical_package_id    |   0
 .../cpu/cpu32/topology/thread_siblings        |   0
 .../cpu/cpu33/online                          |   0
 .../cpu/cpu33/topology/core_id                |   0
 .../cpu/cpu33/topology/physical_package_id    |   0
 .../cpu/cpu33/topology/thread_siblings        |   0
 .../cpu/cpu34/online                          |   0
 .../cpu/cpu34/topology/core_id                |   0
 .../cpu/cpu34/topology/physical_package_id    |   0
 .../cpu/cpu34/topology/thread_siblings        |   0
 .../cpu/cpu35/online                          |   0
 .../cpu/cpu35/topology/core_id                |   0
 .../cpu/cpu35/topology/physical_package_id    |   0
 .../cpu/cpu35/topology/thread_siblings        |   0
 .../cpu/cpu36/online                          |   0
 .../cpu/cpu36/topology/core_id                |   0
 .../cpu/cpu36/topology/physical_package_id    |   0
 .../cpu/cpu36/topology/thread_siblings        |   0
 .../cpu/cpu37/online                          |   0
 .../cpu/cpu37/topology/core_id                |   0
 .../cpu/cpu37/topology/physical_package_id    |   0
 .../cpu/cpu37/topology/thread_siblings        |   0
 .../cpu/cpu38/online                          |   0
 .../cpu/cpu38/topology/core_id                |   0
 .../cpu/cpu38/topology/physical_package_id    |   0
 .../cpu/cpu38/topology/thread_siblings        |   0
 .../cpu/cpu39/online                          |   0
 .../cpu/cpu39/topology/core_id                |   0
 .../cpu/cpu39/topology/physical_package_id    |   0
 .../cpu/cpu39/topology/thread_siblings        |   0
 .../cpu/cpu4/online                           |   0
 .../cpu/cpu4/topology/core_id                 |   0
 .../cpu/cpu4/topology/physical_package_id     |   0
 .../cpu/cpu4/topology/thread_siblings         |   0
 .../cpu/cpu40/online                          |   0
 .../cpu/cpu40/topology/core_id                |   0
 .../cpu/cpu40/topology/physical_package_id    |   0
 .../cpu/cpu40/topology/thread_siblings        |   0
 .../cpu/cpu41/online                          |   0
 .../cpu/cpu41/topology/core_id                |   0
 .../cpu/cpu41/topology/physical_package_id    |   0
 .../cpu/cpu41/topology/thread_siblings        |   0
 .../cpu/cpu42/online                          |   0
 .../cpu/cpu42/topology/core_id                |   0
 .../cpu/cpu42/topology/physical_package_id    |   0
 .../cpu/cpu42/topology/thread_siblings        |   0
 .../cpu/cpu43/online                          |   0
 .../cpu/cpu43/topology/core_id                |   0
 .../cpu/cpu43/topology/physical_package_id    |   0
 .../cpu/cpu43/topology/thread_siblings        |   0
 .../cpu/cpu44/online                          |   0
 .../cpu/cpu44/topology/core_id                |   0
 .../cpu/cpu44/topology/physical_package_id    |   0
 .../cpu/cpu44/topology/thread_siblings        |   0
 .../cpu/cpu45/online                          |   0
 .../cpu/cpu45/topology/core_id                |   0
 .../cpu/cpu45/topology/physical_package_id    |   0
 .../cpu/cpu45/topology/thread_siblings        |   0
 .../cpu/cpu46/online                          |   0
 .../cpu/cpu46/topology/core_id                |   0
 .../cpu/cpu46/topology/physical_package_id    |   0
 .../cpu/cpu46/topology/thread_siblings        |   0
 .../cpu/cpu47/online                          |   0
 .../cpu/cpu47/topology/core_id                |   0
 .../cpu/cpu47/topology/physical_package_id    |   0
 .../cpu/cpu47/topology/thread_siblings        |   0
 .../cpu/cpu5/online                           |   0
 .../cpu/cpu5/topology/core_id                 |   0
 .../cpu/cpu5/topology/physical_package_id     |   0
 .../cpu/cpu5/topology/thread_siblings         |   0
 .../cpu/cpu6/online                           |   0
 .../cpu/cpu6/topology/core_id                 |   0
 .../cpu/cpu6/topology/physical_package_id     |   0
 .../cpu/cpu6/topology/thread_siblings         |   0
 .../cpu/cpu7/online                           |   0
 .../cpu/cpu7/topology/core_id                 |   0
 .../cpu/cpu7/topology/physical_package_id     |   0
 .../cpu/cpu7/topology/thread_siblings         |   0
 .../cpu/cpu8/online                           |   0
 .../cpu/cpu8/topology/core_id                 |   0
 .../cpu/cpu8/topology/physical_package_id     |   0
 .../cpu/cpu8/topology/thread_siblings         |   0
 .../cpu/cpu9/online                           |   0
 .../cpu/cpu9/topology/core_id                 |   0
 .../cpu/cpu9/topology/physical_package_id     |   0
 .../cpu/cpu9/topology/thread_siblings         |   0
 .../node/node0/cpu0                           |   0
 .../node/node0/cpu12                          |   0
 .../node/node0/cpu16                          |   0
 .../node/node0/cpu20                          |   0
 .../node/node0/cpu4                           |   0
 .../node/node0/cpu8                           |   0
 .../node/node0/meminfo                        |   0
 .../node/node1/cpu24                          |   0
 .../node/node1/cpu28                          |   0
 .../node/node1/cpu32                          |   0
 .../node/node1/cpu36                          |   0
 .../node/node1/cpu40                          |   0
 .../node/node1/cpu44                          |   0
 .../node/node1/meminfo                        |   0
 .../node/node2/cpu11                          |   0
 .../node/node2/cpu15                          |   0
 .../node/node2/cpu19                          |   0
 .../node/node2/cpu23                          |   0
 .../node/node2/cpu3                           |   0
 .../node/node2/cpu7                           |   0
 .../node/node2/meminfo                        |   0
 .../node/node3/cpu27                          |   0
 .../node/node3/cpu31                          |   0
 .../node/node3/cpu35                          |   0
 .../node/node3/cpu39                          |   0
 .../node/node3/cpu43                          |   0
 .../node/node3/cpu47                          |   0
 .../node/node3/meminfo                        |   0
 .../node/node4/cpu10                          |   0
 .../node/node4/cpu14                          |   0
 .../node/node4/cpu18                          |   0
 .../node/node4/cpu2                           |   0
 .../node/node4/cpu22                          |   0
 .../node/node4/cpu6                           |   0
 .../node/node4/meminfo                        |   0
 .../node/node5/cpu26                          |   0
 .../node/node5/cpu30                          |   0
 .../node/node5/cpu34                          |   0
 .../node/node5/cpu38                          |   0
 .../node/node5/cpu42                          |   0
 .../node/node5/cpu46                          |   0
 .../node/node5/meminfo                        |   0
 .../node/node6/cpu1                           |   0
 .../node/node6/cpu13                          |   0
 .../node/node6/cpu17                          |   0
 .../node/node6/cpu21                          |   0
 .../node/node6/cpu5                           |   0
 .../node/node6/cpu9                           |   0
 .../node/node6/meminfo                        |   0
 .../node/node7/cpu25                          |   0
 .../node/node7/cpu29                          |   0
 .../node/node7/cpu33                          |   0
 .../node/node7/cpu37                          |   0
 .../node/node7/cpu41                          |   0
 .../node/node7/cpu45                          |   0
 .../node/node7/meminfo                        |   0
 .../node/possible                             | Bin
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu10/online                          |   0
 .../cpu/cpu10/topology/core_id                |   0
 .../cpu/cpu10/topology/physical_package_id    |   0
 .../cpu/cpu10/topology/thread_siblings        |   0
 .../cpu/cpu11/online                          |   0
 .../cpu/cpu11/topology/core_id                |   0
 .../cpu/cpu11/topology/physical_package_id    |   0
 .../cpu/cpu11/topology/thread_siblings        |   0
 .../cpu/cpu12/online                          |   0
 .../cpu/cpu12/topology/core_id                |   0
 .../cpu/cpu12/topology/physical_package_id    |   0
 .../cpu/cpu12/topology/thread_siblings        |   0
 .../cpu/cpu13/online                          |   0
 .../cpu/cpu13/topology/core_id                |   0
 .../cpu/cpu13/topology/physical_package_id    |   0
 .../cpu/cpu13/topology/thread_siblings        |   0
 .../cpu/cpu14/online                          |   0
 .../cpu/cpu14/topology/core_id                |   0
 .../cpu/cpu14/topology/physical_package_id    |   0
 .../cpu/cpu14/topology/thread_siblings        |   0
 .../cpu/cpu15/online                          |   0
 .../cpu/cpu15/topology/core_id                |   0
 .../cpu/cpu15/topology/physical_package_id    |   0
 .../cpu/cpu15/topology/thread_siblings        |   0
 .../cpu/cpu2/online                           |   0
 .../cpu/cpu2/topology/core_id                 |   0
 .../cpu/cpu2/topology/physical_package_id     |   0
 .../cpu/cpu2/topology/thread_siblings         |   0
 .../cpu/cpu3/online                           |   0
 .../cpu/cpu3/topology/core_id                 |   0
 .../cpu/cpu3/topology/physical_package_id     |   0
 .../cpu/cpu3/topology/thread_siblings         |   0
 .../cpu/cpu4/online                           |   0
 .../cpu/cpu4/topology/core_id                 |   0
 .../cpu/cpu4/topology/physical_package_id     |   0
 .../cpu/cpu4/topology/thread_siblings         |   0
 .../cpu/cpu5/online                           |   0
 .../cpu/cpu5/topology/core_id                 |   0
 .../cpu/cpu5/topology/physical_package_id     |   0
 .../cpu/cpu5/topology/thread_siblings         |   0
 .../cpu/cpu6/online                           |   0
 .../cpu/cpu6/topology/core_id                 |   0
 .../cpu/cpu6/topology/physical_package_id     |   0
 .../cpu/cpu6/topology/thread_siblings         |   0
 .../cpu/cpu7/online                           |   0
 .../cpu/cpu7/topology/core_id                 |   0
 .../cpu/cpu7/topology/physical_package_id     |   0
 .../cpu/cpu7/topology/thread_siblings         |   0
 .../cpu/cpu8/online                           |   0
 .../cpu/cpu8/topology/core_id                 |   0
 .../cpu/cpu8/topology/physical_package_id     |   0
 .../cpu/cpu8/topology/thread_siblings         |   0
 .../cpu/cpu9/online                           |   0
 .../cpu/cpu9/topology/core_id                 |   0
 .../cpu/cpu9/topology/physical_package_id     |   0
 .../cpu/cpu9/topology/thread_siblings         |   0
 .../node/node0/cpu0                           |   0
 .../node/node0/cpu1                           |   0
 .../node/node0/cpu2                           |   0
 .../node/node0/cpu3                           |   0
 .../node/node0/cpu4                           |   0
 .../node/node0/cpu5                           |   0
 .../node/node0/cpu6                           |   0
 .../node/node0/cpu7                           |   0
 .../node/node0/meminfo                        |   0
 .../node/node1/cpu10                          |   0
 .../node/node1/cpu11                          |   0
 .../node/node1/cpu12                          |   0
 .../node/node1/cpu13                          |   0
 .../node/node1/cpu14                          |   0
 .../node/node1/cpu15                          |   0
 .../node/node1/cpu8                           |   0
 .../node/node1/cpu9                           |   0
 .../node/node1/meminfo                        |   0
 .../node/possible                             | Bin
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/core_siblings           |   0
 .../cpu/cpu0/topology/core_siblings_list      |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu0/topology/thread_siblings_list    |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/core_siblings           |   0
 .../cpu/cpu1/topology/core_siblings_list      |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu1/topology/thread_siblings_list    |   0
 .../cpu/cpu2/online                           |   0
 .../cpu/cpu2/topology/core_id                 |   0
 .../cpu/cpu2/topology/core_siblings           |   0
 .../cpu/cpu2/topology/core_siblings_list      |   0
 .../cpu/cpu2/topology/physical_package_id     |   0
 .../cpu/cpu2/topology/thread_siblings         |   0
 .../cpu/cpu2/topology/thread_siblings_list    |   0
 .../cpu/cpu3/online                           |   0
 .../cpu/cpu3/topology/core_id                 |   0
 .../cpu/cpu3/topology/core_siblings           |   0
 .../cpu/cpu3/topology/core_siblings_list      |   0
 .../cpu/cpu3/topology/physical_package_id     |   0
 .../cpu/cpu3/topology/thread_siblings         |   0
 .../cpu/cpu3/topology/thread_siblings_list    |   0
 .../cpu/cpu0/topology/core_id                 |   0
 .../cpu/cpu0/topology/physical_package_id     |   0
 .../cpu/cpu0/topology/thread_siblings         |   0
 .../cpu/cpu1/online                           |   0
 .../cpu/cpu1/topology/core_id                 |   0
 .../cpu/cpu1/topology/physical_package_id     |   0
 .../cpu/cpu1/topology/thread_siblings         |   0
 .../cpu/cpu2/online                           |   0
 .../cpu/cpu2/topology/core_id                 |   0
 .../cpu/cpu2/topology/physical_package_id     |   0
 .../cpu/cpu2/topology/thread_siblings         |   0
 .../cpu/cpu3/online                           |   0
 .../cpu/cpu3/topology/core_id                 |   0
 .../cpu/cpu3/topology/physical_package_id     |   0
 .../cpu/cpu3/topology/thread_siblings         |   0
 .../cpu/cpu4/online                           |   0
 .../cpu/cpu4/topology/core_id                 |   0
 .../cpu/cpu4/topology/physical_package_id     |   0
 .../cpu/cpu4/topology/thread_siblings         |   0
 .../cpu/cpu5/online                           |   0
 .../cpu/cpu6/online                           |   0
 .../cpu/cpu6/topology/core_id                 |   0
 .../cpu/cpu6/topology/physical_package_id     |   0
 .../cpu/cpu6/topology/thread_siblings         |   0
 .../cpu/cpu7/online                           |   0
 .../node/node0/cpu0                           |   0
 .../node/node0/cpu1                           |   0
 .../node/node0/cpu2                           |   0
 .../node/node0/cpu3                           |   0
 .../node/node0/cpu4                           |   0
 .../node/node0/cpu5                           |   0
 .../node/node0/cpu6                           |   0
 .../node/node0/cpu7                           |   0
 .../node/node0/meminfo                        |   0
 .../node/online                               | Bin
 .../node/possible                             | Bin
 ...-1-x86.cpuinfo => linux-x86-test1.cpuinfo} |   0
 ...86-output.txt => linux-x86-test1.expected} |   0
 ...-2-x86.cpuinfo => linux-x86-test2.cpuinfo} |   0
 ...86-output.txt => linux-x86-test2.expected} |   0
 ...-3-x86.cpuinfo => linux-x86-test3.cpuinfo} |   0
 ...86-output.txt => linux-x86-test3.expected} |   0
 ...-4-x86.cpuinfo => linux-x86-test4.cpuinfo} |   0
 ...86-output.txt => linux-x86-test4.expected} |   0
 ...-5-x86.cpuinfo => linux-x86-test5.cpuinfo} |   0
 ...86-output.txt => linux-x86-test5.expected} |   0
 ...-6-x86.cpuinfo => linux-x86-test6.cpuinfo} |   0
 ...86-output.txt => linux-x86-test6.expected} |   0
 tests/nodeinfotest.c                          |  18 +++++++++---------
 447 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt => linux-ppc-test1.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu0/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/cpu/cpu1/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/node/node0/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1 => linux-test1}/node/node1/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu0/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/cpu/cpu1/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/node/node0/cpu0 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/node/node0/cpu1 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/node/node0/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2 => linux-test2}/node/possible (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu10/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu10/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu10/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu10/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu11/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu11/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu11/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu11/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu12/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu12/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu12/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu12/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu13/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu13/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu13/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu13/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu14/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu14/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu14/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu14/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu15/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu15/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu15/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu15/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu16/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu16/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu16/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu16/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu17/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu17/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu17/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu17/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu18/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu18/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu18/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu18/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu19/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu19/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu19/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu19/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu2/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu2/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu2/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu2/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu20/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu20/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu20/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu20/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu21/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu21/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu21/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu21/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu22/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu22/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu22/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu22/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu23/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu23/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu23/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu23/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu24/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu24/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu24/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu24/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu25/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu25/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu25/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu25/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu26/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu26/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu26/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu26/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu27/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu27/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu27/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu27/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu28/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu28/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu28/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu28/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu29/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu29/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu29/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu29/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu3/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu3/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu3/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu3/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu30/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu30/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu30/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu30/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu31/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu31/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu31/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu31/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu32/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu32/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu32/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu32/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu33/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu33/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu33/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu33/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu34/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu34/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu34/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu34/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu35/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu35/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu35/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu35/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu36/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu36/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu36/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu36/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu37/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu37/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu37/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu37/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu38/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu38/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu38/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu38/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu39/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu39/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu39/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu39/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu4/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu4/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu4/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu4/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu40/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu40/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu40/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu40/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu41/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu41/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu41/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu41/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu42/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu42/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu42/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu42/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu43/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu43/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu43/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu43/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu44/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu44/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu44/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu44/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu45/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu45/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu45/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu45/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu46/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu46/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu46/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu46/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu47/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu47/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu47/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu47/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu5/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu5/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu5/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu5/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu6/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu6/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu6/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu6/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu7/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu7/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu7/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu7/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu8/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu8/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu8/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu8/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu9/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu9/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu9/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/cpu/cpu9/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu0 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu12 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu16 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu20 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu4 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/cpu8 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node0/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu24 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu28 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu32 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu36 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu40 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/cpu44 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node1/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu11 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu15 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu19 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu23 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu3 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/cpu7 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node2/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu27 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu31 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu35 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu39 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu43 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/cpu47 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node3/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu10 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu14 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu18 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu2 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu22 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/cpu6 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node4/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu26 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu30 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu34 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu38 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu42 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/cpu46 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node5/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu1 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu13 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu17 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu21 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu5 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/cpu9 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node6/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu25 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu29 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu33 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu37 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu41 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/cpu45 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/node7/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3 => linux-test3}/node/possible (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu10/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu10/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu10/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu10/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu11/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu11/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu11/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu11/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu12/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu12/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu12/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu12/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu13/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu13/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu13/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu13/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu14/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu14/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu14/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu14/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu15/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu15/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu15/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu15/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu2/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu2/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu2/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu2/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu3/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu3/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu3/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu3/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu4/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu4/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu4/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu4/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu5/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu5/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu5/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu5/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu6/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu6/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu6/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu6/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu7/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu7/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu7/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu7/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu8/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu8/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu8/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu8/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu9/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu9/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu9/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/cpu/cpu9/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu0 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu1 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu2 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu3 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu4 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu5 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu6 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/cpu7 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node0/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu10 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu11 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu12 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu13 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu14 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu15 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu8 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/cpu9 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/node1/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4 => linux-test4}/node/possible (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu0/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu1/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu2/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/core_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/core_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5 => linux-test5}/cpu/cpu3/topology/thread_siblings_list (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu0/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu0/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu0/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu1/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu1/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu1/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu1/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu2/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu2/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu2/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu2/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu3/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu3/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu3/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu3/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu4/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu4/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu4/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu4/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu5/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu6/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu6/topology/core_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu6/topology/physical_package_id (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu6/topology/thread_siblings (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/cpu/cpu7/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu0 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu1 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu2 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu3 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu4 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu5 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu6 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/cpu7 (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/node0/meminfo (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/online (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6 => linux-test6}/node/possible (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-x86.cpuinfo => linux-x86-test1.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt => linux-x86-test1.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2-x86.cpuinfo => linux-x86-test2.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt => linux-x86-test2.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3-x86.cpuinfo => linux-x86-test3.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt => linux-x86-test3.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4-x86.cpuinfo => linux-x86-test4.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt => linux-x86-test4.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5-x86.cpuinfo => linux-x86-test5.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt => linux-x86-test5.expected} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6-x86.cpuinfo => linux-x86-test6.cpuinfo} (100%)
 rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt => linux-x86-test6.expected} (100%)

diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo b/tests/nodeinfodata/linux-ppc-test1.cpuinfo
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu0/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/cpu/cpu1/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu0
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/cpu1
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/node0/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2/node/possible
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu10/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu11/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu12/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu13/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu14/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu15/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu16/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu17/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu18/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu19/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu2/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu20/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu21/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu22/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu23/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu24/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu25/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu26/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu27/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu28/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu29/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu3/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu30/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu31/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu32/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu33/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu34/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu35/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu36/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu37/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu38/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu39/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu4/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu40/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu41/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu42/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu43/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu44/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu45/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu46/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu47/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu5/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu6/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu7/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu8/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/cpu/cpu9/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu0
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu12
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu16
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu20
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu4
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/cpu8
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node0/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu24
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu28
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu32
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu36
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu40
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/cpu44
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node1/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu11
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu15
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu19
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu23
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu3
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/cpu7
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node2/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu27
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu31
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu35
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu39
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu43
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/cpu47
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node3/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu10
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu14
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu18
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu2
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu22
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/cpu6
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node4/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu26
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu30
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu34
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu38
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu42
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/cpu46
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node5/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu1
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu13
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu17
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu21
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu5
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/cpu9
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node6/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu25
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu29
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu33
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu37
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu41
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/cpu45
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/node7/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3/node/possible
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu0
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu1
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu2
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu3
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu4
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu5
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu6
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/cpu7
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu10
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu11
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu12
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu13
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu14
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu15
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu8
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/cpu9
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/possible
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu0/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu1/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu2/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/core_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5/cpu/cpu3/topology/thread_siblings_list
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
rename to 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
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
rename to tests/nodeinfodata/linux-x86-test6.expected
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 851acd0696..c44cc8afc8 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
     };
 
-- 
GitLab