Modify the tests/nodeinfotest.c to use sysfs in addition

 to proc/cpuinfo

This patch creates a new sysfs hierarchy under
tests/nodeinfodata/linux-nodeinfo-sysfs-test-1.
Output files and /proc/cpuinfo files are also respectively added for
both x86 and ppc64.

Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>

42 files changed, 86 insertions, 604 deletions

diff --git a/tests/nodeinfodata/linux-nodeinfo-1.meminfo b/tests/nodeinfodata/linux-nodeinfo-1.meminfo
deleted file mode 100644
index dd5565ecf..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-1.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      2053960 kB
-MemFree:        157792 kB
-Buffers:        209440 kB
-Cached:         660788 kB
-SwapCached:         76 kB
-Active:        1416036 kB
-Inactive:       178872 kB
-SwapTotal:     2064376 kB
-SwapFree:      2063940 kB
-Dirty:            1736 kB
-Writeback:           0 kB
-AnonPages:      723984 kB
-Mapped:         105208 kB
-Slab:           225000 kB
-SReclaimable:   172568 kB
-SUnreclaim:      52432 kB
-PageTables:      40224 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   3091356 kB
-Committed_AS:  1270588 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:     30640 kB
-VmallocChunk: 34359705907 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-2.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-2.cpuinfo
deleted file mode 100644
index 95d96e131..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-2.cpuinfo
+++ /dev/null
@@ -1,47 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 75
-model name	: AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
-stepping	: 2
-cpu MHz		: 2211.364
-cache size	: 512 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 4424.80
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 75
-model name	: AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
-stepping	: 2
-cpu MHz		: 2211.364
-cache size	: 512 KB
-physical id	: 0
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 4422.14
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
diff --git a/tests/nodeinfodata/linux-nodeinfo-2.meminfo b/tests/nodeinfodata/linux-nodeinfo-2.meminfo
deleted file mode 100644
index e1d9b8654..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-2.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      4059540 kB
-MemFree:       3525008 kB
-Buffers:         24480 kB
-Cached:         282300 kB
-SwapCached:          0 kB
-Active:         230980 kB
-Inactive:       243276 kB
-SwapTotal:     2031608 kB
-SwapFree:      2031608 kB
-Dirty:             200 kB
-Writeback:           0 kB
-AnonPages:      167376 kB
-Mapped:          31204 kB
-Slab:            34904 kB
-SReclaimable:    15544 kB
-SUnreclaim:      19360 kB
-PageTables:       7704 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   4061376 kB
-Committed_AS:   265176 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:      1736 kB
-VmallocChunk: 34359736147 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-2.txt b/tests/nodeinfodata/linux-nodeinfo-2.txt
deleted file mode 100644
index e4eea943d..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPUs: 2, MHz: 2211, Nodes: 1, Cores: 2
diff --git a/tests/nodeinfodata/linux-nodeinfo-3.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-3.cpuinfo
deleted file mode 100644
index 94e3c016a..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-3.cpuinfo
+++ /dev/null
@@ -1,99 +0,0 @@
-processor       : 0
-vendor_id       : GenuineIntel
-cpu family      : 6
-model           : 15
-model name      : Intel(R) Xeon(R) CPU            5110  @ 1.60GHz
-stepping        : 6
-cpu MHz         : 1595.925
-cache size      : 4096 KB
-physical id     : 0
-siblings        : 2
-core id         : 0
-cpu cores       : 2
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 10
-wp              : yes
-flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov
-pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc
-pni monitor ds_cpl vmx tm2 ssse3 cx16 xtpr dca lahf_lm
-bogomips        : 3193.88
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 36 bits physical, 48 bits virtual
-power management:
-
-processor       : 1
-vendor_id       : GenuineIntel
-cpu family      : 6
-model           : 15
-model name      : Intel(R) Xeon(R) CPU            5110  @ 1.60GHz
-stepping        : 6
-cpu MHz         : 1595.925
-cache size      : 4096 KB
-physical id     : 3
-siblings        : 2
-core id         : 0
-cpu cores       : 2
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 10
-wp              : yes
-flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov
-pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc
-pni monitor ds_cpl vmx tm2 ssse3 cx16 xtpr dca lahf_lm
-bogomips        : 3191.89
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 36 bits physical, 48 bits virtual
-power management:
-
-processor       : 2
-vendor_id       : GenuineIntel
-cpu family      : 6
-model           : 15
-model name      : Intel(R) Xeon(R) CPU            5110  @ 1.60GHz
-stepping        : 6
-cpu MHz         : 1595.925
-cache size      : 4096 KB
-physical id     : 0
-siblings        : 2
-core id         : 1
-cpu cores       : 2
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 10
-wp              : yes
-flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov
-pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc
-pni monitor ds_cpl vmx tm2 ssse3 cx16 xtpr dca lahf_lm
-bogomips        : 3191.88
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 36 bits physical, 48 bits virtual
-power management:
-
-processor       : 3
-vendor_id       : GenuineIntel
-cpu family      : 6
-model           : 15
-model name      : Intel(R) Xeon(R) CPU            5110  @ 1.60GHz
-stepping        : 6
-cpu MHz         : 1595.925
-cache size      : 4096 KB
-physical id     : 3
-siblings        : 2
-core id         : 1
-cpu cores       : 2
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 10
-wp              : yes
-flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov
-pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc
-pni monitor ds_cpl vmx tm2 ssse3 cx16 xtpr dca lahf_lm
-bogomips        : 3191.87
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 36 bits physical, 48 bits virtual
-power management:
diff --git a/tests/nodeinfodata/linux-nodeinfo-3.meminfo b/tests/nodeinfodata/linux-nodeinfo-3.meminfo
deleted file mode 100644
index 6bb8f6462..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-3.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      4059272 kB
-MemFree:       3532828 kB
-Buffers:         16644 kB
-Cached:         286152 kB
-SwapCached:          0 kB
-Active:         252032 kB
-Inactive:       220148 kB
-SwapTotal:     2031608 kB
-SwapFree:      2031608 kB
-Dirty:              76 kB
-Writeback:           0 kB
-AnonPages:      169548 kB
-Mapped:          25456 kB
-Slab:            27260 kB
-SReclaimable:     9512 kB
-SUnreclaim:      17748 kB
-PageTables:       7552 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   4061244 kB
-Committed_AS:   278572 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:      2044 kB
-VmallocChunk: 34359736107 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-3.txt b/tests/nodeinfodata/linux-nodeinfo-3.txt
deleted file mode 100644
index 17d4d8e21..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPUs: 4, MHz: 1595, Nodes: 1, Cores: 2
diff --git a/tests/nodeinfodata/linux-nodeinfo-4.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-4.cpuinfo
deleted file mode 100644
index 535a29d44..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-4.cpuinfo
+++ /dev/null
@@ -1,95 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: AMD Processor model unknown
-stepping	: 0
-cpu MHz		: 1000.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4131.46
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: AMD Processor model unknown
-stepping	: 0
-cpu MHz		: 1000.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 3200.13
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: AMD Processor model unknown
-stepping	: 0
-cpu MHz		: 1000.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 3200.14
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: AMD Processor model unknown
-stepping	: 0
-cpu MHz		: 1000.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 3200.01
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
diff --git a/tests/nodeinfodata/linux-nodeinfo-4.meminfo b/tests/nodeinfodata/linux-nodeinfo-4.meminfo
deleted file mode 100644
index 6bb8f6462..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-4.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      4059272 kB
-MemFree:       3532828 kB
-Buffers:         16644 kB
-Cached:         286152 kB
-SwapCached:          0 kB
-Active:         252032 kB
-Inactive:       220148 kB
-SwapTotal:     2031608 kB
-SwapFree:      2031608 kB
-Dirty:              76 kB
-Writeback:           0 kB
-AnonPages:      169548 kB
-Mapped:          25456 kB
-Slab:            27260 kB
-SReclaimable:     9512 kB
-SUnreclaim:      17748 kB
-PageTables:       7552 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   4061244 kB
-Committed_AS:   278572 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:      2044 kB
-VmallocChunk: 34359736107 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-4.txt b/tests/nodeinfodata/linux-nodeinfo-4.txt
deleted file mode 100644
index 5a5c919ae..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPUs: 4, MHz: 1000, Nodes: 1, Cores: 4
diff --git a/tests/nodeinfodata/linux-nodeinfo-5.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-5.cpuinfo
deleted file mode 100644
index 7cb6e183d..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-5.cpuinfo
+++ /dev/null
@@ -1,95 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2220
-stepping	: 3
-cpu MHz		: 2814.921
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 5633.58
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2220
-stepping	: 3
-cpu MHz		: 2814.921
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 5629.01
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2220
-stepping	: 3
-cpu MHz		: 2814.921
-cache size	: 1024 KB
-physical id	: 1
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 5628.94
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2220
-stepping	: 3
-cpu MHz		: 2814.921
-cache size	: 1024 KB
-physical id	: 1
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy
-bogomips	: 5628.86
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
diff --git a/tests/nodeinfodata/linux-nodeinfo-5.meminfo b/tests/nodeinfodata/linux-nodeinfo-5.meminfo
deleted file mode 100644
index 6bb8f6462..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-5.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      4059272 kB
-MemFree:       3532828 kB
-Buffers:         16644 kB
-Cached:         286152 kB
-SwapCached:          0 kB
-Active:         252032 kB
-Inactive:       220148 kB
-SwapTotal:     2031608 kB
-SwapFree:      2031608 kB
-Dirty:              76 kB
-Writeback:           0 kB
-AnonPages:      169548 kB
-Mapped:          25456 kB
-Slab:            27260 kB
-SReclaimable:     9512 kB
-SUnreclaim:      17748 kB
-PageTables:       7552 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   4061244 kB
-Committed_AS:   278572 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:      2044 kB
-VmallocChunk: 34359736107 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-5.txt b/tests/nodeinfodata/linux-nodeinfo-5.txt
deleted file mode 100644
index 54abb5d39..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPUs: 4, MHz: 2814, Nodes: 1, Cores: 2
diff --git a/tests/nodeinfodata/linux-nodeinfo-6.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-6.cpuinfo
deleted file mode 100644
index a08cf2658..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-6.cpuinfo
+++ /dev/null
@@ -1,95 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2218
-stepping	: 2
-cpu MHz		: 1000.000
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips	: 1999.99
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2218
-stepping	: 2
-cpu MHz		: 1000.000
-cache size	: 1024 KB
-physical id	: 1
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips	: 1999.99
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2218
-stepping	: 2
-cpu MHz		: 1000.000
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips	: 1999.99
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 65
-model name	: Dual-Core AMD Opteron(tm) Processor 2218
-stepping	: 2
-cpu MHz		: 1000.000
-cache size	: 1024 KB
-physical id	: 1
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips	: 1999.99
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
diff --git a/tests/nodeinfodata/linux-nodeinfo-6.meminfo b/tests/nodeinfodata/linux-nodeinfo-6.meminfo
deleted file mode 100644
index 6bb8f6462..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-6.meminfo
+++ /dev/null
@@ -1,28 +0,0 @@
-MemTotal:      4059272 kB
-MemFree:       3532828 kB
-Buffers:         16644 kB
-Cached:         286152 kB
-SwapCached:          0 kB
-Active:         252032 kB
-Inactive:       220148 kB
-SwapTotal:     2031608 kB
-SwapFree:      2031608 kB
-Dirty:              76 kB
-Writeback:           0 kB
-AnonPages:      169548 kB
-Mapped:          25456 kB
-Slab:            27260 kB
-SReclaimable:     9512 kB
-SUnreclaim:      17748 kB
-PageTables:       7552 kB
-NFS_Unstable:        0 kB
-Bounce:              0 kB
-CommitLimit:   4061244 kB
-Committed_AS:   278572 kB
-VmallocTotal: 34359738367 kB
-VmallocUsed:      2044 kB
-VmallocChunk: 34359736107 kB
-HugePages_Total:     0
-HugePages_Free:      0
-HugePages_Rsvd:      0
-Hugepagesize:     2048 kB
diff --git a/tests/nodeinfodata/linux-nodeinfo-6.txt b/tests/nodeinfodata/linux-nodeinfo-6.txt
deleted file mode 100644
index f89e35ee6..000000000
--- a/tests/nodeinfodata/linux-nodeinfo-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPUs: 4, MHz: 1000, Nodes: 1, Cores: 2
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
new file mode 100644
index 000000000..433a81f85
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
@@ -0,0 +1 @@
+CPUs: 2, MHz: 8, Nodes: 1, Cores: 2
diff --git a/tests/nodeinfodata/linux-nodeinfo-1.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
index 09e29464b..09e29464b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-1.txt
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo
new file mode 100644
index 000000000..38f2050cf
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-ppc.cpuinfo
@@ -0,0 +1,9 @@
+processor	: 0
+cpu		: POWER7 (raw), altivec supported
+clock		: 8.388608MHz
+revision	: 2.3 (pvr 003f 0203)
+
+processor	: 1
+cpu		: POWER7 (raw), altivec supported
+clock		: 8.388608MHz
+revision	: 2.3 (pvr 003f 0203)
diff --git a/tests/nodeinfodata/linux-nodeinfo-1.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-x86.cpuinfo
index e88a48ff3..e88a48ff3 100644
--- a/tests/nodeinfodata/linux-nodeinfo-1.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-x86.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/online
@@ -0,0 +1 @@
+1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings
new file mode 100644
index 000000000..b9ad9ed2c
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings
@@ -0,0 +1 @@
+00000003
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list
new file mode 100644
index 000000000..8b0fab869
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/core_siblings_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings
new file mode 100644
index 000000000..d34760397
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings
@@ -0,0 +1 @@
+00000001
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu0/topology/thread_siblings_list
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings
new file mode 100644
index 000000000..b9ad9ed2c
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings
@@ -0,0 +1 @@
+00000003
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list
new file mode 100644
index 000000000..8b0fab869
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/core_siblings_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/online
@@ -0,0 +1 @@
+1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings
new file mode 100644
index 000000000..0af11c552
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings
@@ -0,0 +1 @@
+00000002
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/thread_siblings_list
@@ -0,0 +1 @@
+1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings
new file mode 100644
index 000000000..b9ad9ed2c
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings
@@ -0,0 +1 @@
+00000003
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list
new file mode 100644
index 000000000..8b0fab869
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/core_siblings_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings
new file mode 100644
index 000000000..d34760397
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings
@@ -0,0 +1 @@
+00000001
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/cpu/cpu1/topology/thread_siblings_list
@@ -0,0 +1 @@
+0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo
new file mode 100644
index 000000000..ad2286a13
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node0/meminfo
@@ -0,0 +1,28 @@
+Node 0 MemTotal:       33554432 kB
+Node 0 MemFree:        12351744 kB
+Node 0 MemUsed:        21202688 kB
+Node 0 Active:          2086528 kB
+Node 0 Inactive:        1816512 kB
+Node 0 Active(anon):     174208 kB
+Node 0 Inactive(anon):     3840 kB
+Node 0 Active(file):    1912320 kB
+Node 0 Inactive(file):  1812672 kB
+Node 0 Unevictable:           0 kB
+Node 0 Mlocked:               0 kB
+Node 0 Dirty:                 0 kB
+Node 0 Writeback:             0 kB
+Node 0 FilePages:       3758976 kB
+Node 0 Mapped:            13440 kB
+Node 0 AnonPages:        160704 kB
+Node 0 Shmem:             17664 kB
+Node 0 KernelStack:        2944 kB
+Node 0 PageTables:        12032 kB
+Node 0 NFS_Unstable:          0 kB
+Node 0 Bounce:                0 kB
+Node 0 WritebackTmp:          0 kB
+Node 0 Slab:             315904 kB
+Node 0 SReclaimable:     197824 kB
+Node 0 SUnreclaim:       118080 kB
+Node 0 HugePages_Total:  1024
+Node 0 HugePages_Free:    768
+Node 0 HugePages_Surp:      0
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo
new file mode 100644
index 000000000..7666eb67f
--- /dev/null
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1/node/node1/meminfo
@@ -0,0 +1,28 @@
+Node 1 MemTotal:       33554432 kB
+Node 1 MemFree:        11934016 kB
+Node 1 MemUsed:        21620416 kB
+Node 1 Active:          3225728 kB
+Node 1 Inactive:        1057536 kB
+Node 1 Active(anon):     154752 kB
+Node 1 Inactive(anon):    80320 kB
+Node 1 Active(file):    3070976 kB
+Node 1 Inactive(file):   977216 kB
+Node 1 Unevictable:           0 kB
+Node 1 Mlocked:               0 kB
+Node 1 Dirty:               192 kB
+Node 1 Writeback:             0 kB
+Node 1 FilePages:       4165696 kB
+Node 1 Mapped:            36416 kB
+Node 1 AnonPages:        117248 kB
+Node 1 Shmem:            117760 kB
+Node 1 KernelStack:        2144 kB
+Node 1 PageTables:        10368 kB
+Node 1 NFS_Unstable:          0 kB
+Node 1 Bounce:                0 kB
+Node 1 WritebackTmp:          0 kB
+Node 1 Slab:             277888 kB
+Node 1 SReclaimable:     175744 kB
+Node 1 SUnreclaim:       102144 kB
+Node 1 HugePages_Total:  1024
+Node 1 HugePages_Free:   1024
+Node 1 HugePages_Surp:      0