tests: cleanup, remove unused lscpu output

All these files are not used since a292bbde or 0d86c70a.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

17 files changed, 0 insertions, 1114 deletions

diff --git a/tests/expected/lscpu/lscpu-i386-amdshanghai b/tests/expected/lscpu/lscpu-i386-amdshanghai
deleted file mode 100644
index 25dcaa974..000000000
--- a/tests/expected/lscpu/lscpu-i386-amdshanghai
+++ /dev/null
@@ -1,29 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                8
-Thread(s) per core:    1
-Core(s) per socket:    4
-Socket(s):             2
-Vendor ID:             AuthenticAMD
-CPU family:            16
-Model:                 4
-Stepping:              0
-CPU MHz:               1995.158
-BogoMIPS:              3989.99
-Virtualization:        AMD-V
-L1d cache:             512K
-L1i cache:             512K
-L2 cache:              512K
-L3 cache:              6144K
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,,,0,0,0,0
-1,1,0,,,1,1,1,1
-2,2,0,,,2,2,2,2
-3,3,0,,,3,3,3,3
-4,4,1,,,4,4,4,4
-5,5,1,,,5,5,5,5
-6,6,1,,,6,6,6,6
-7,7,1,,,7,7,7,7
diff --git a/tests/expected/lscpu/lscpu-i386-dellpe700 b/tests/expected/lscpu/lscpu-i386-dellpe700
deleted file mode 100644
index 77c30afc6..000000000
--- a/tests/expected/lscpu/lscpu-i386-dellpe700
+++ /dev/null
@@ -1,17 +0,0 @@
-CPU(s):                2
-Thread(s) per core:    2
-Core(s) per socket:    1
-Socket(s):             1
-Vendor ID:             GenuineIntel
-CPU family:            15
-Model:                 2
-Stepping:              9
-CPU MHz:               3391.773
-BogoMIPS:              6781.99
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node
-0,0,0,
-1,0,0,
diff --git a/tests/expected/lscpu/lscpu-i386-intels5000phb b/tests/expected/lscpu/lscpu-i386-intels5000phb
deleted file mode 100644
index bc6456573..000000000
--- a/tests/expected/lscpu/lscpu-i386-intels5000phb
+++ /dev/null
@@ -1,28 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                8
-Thread(s) per core:    1
-Core(s) per socket:    4
-Socket(s):             2
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 15
-Stepping:              7
-CPU MHz:               1596.044
-BogoMIPS:              3191.91
-Virtualization:        VT-x
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              4096K
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2
-0,0,0,,,0,0,0
-1,1,0,,,1,1,0
-2,2,0,,,2,2,1
-3,3,0,,,3,3,1
-4,4,1,,,4,4,2
-5,5,1,,,5,5,2
-6,6,1,,,6,6,3
-7,7,1,,,7,7,3
diff --git a/tests/expected/lscpu/lscpu-i386-xenpara b/tests/expected/lscpu/lscpu-i386-xenpara
deleted file mode 100644
index ae3fa2c1a..000000000
--- a/tests/expected/lscpu/lscpu-i386-xenpara
+++ /dev/null
@@ -1,19 +0,0 @@
-CPU(s):                2
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 23
-Stepping:              6
-CPU MHz:               2493.776
-Virtualization:        VT-x
-Hypervisor vendor:     Xen
-Virtualization type:   para
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              6144K
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2
-0,,,,,0,0,0
-1,,,,,1,1,0
diff --git a/tests/expected/lscpu/lscpu-ia64-512cpus b/tests/expected/lscpu/lscpu-ia64-512cpus
deleted file mode 100644
index 0de3ff417..000000000
--- a/tests/expected/lscpu/lscpu-ia64-512cpus
+++ /dev/null
@@ -1,654 +0,0 @@
-CPU(s):                512
-Thread(s) per core:    1
-Core(s) per socket:    2
-Socket(s):             256
-NUMA node(s):          128
-Vendor ID:             GenuineIntel
-CPU family:            32
-Model:                 0
-CPU MHz:               1594.000007
-NUMA node0 CPU(s):     0-3
-NUMA node1 CPU(s):     4-7
-NUMA node2 CPU(s):     8-11
-NUMA node3 CPU(s):     12-15
-NUMA node4 CPU(s):     16-19
-NUMA node5 CPU(s):     20-23
-NUMA node6 CPU(s):     24-27
-NUMA node7 CPU(s):     28-31
-NUMA node8 CPU(s):     32-35
-NUMA node9 CPU(s):     36-39
-NUMA node10 CPU(s):    40-43
-NUMA node11 CPU(s):    44-47
-NUMA node12 CPU(s):    48-51
-NUMA node13 CPU(s):    52-55
-NUMA node14 CPU(s):    56-59
-NUMA node15 CPU(s):    60-63
-NUMA node16 CPU(s):    64-67
-NUMA node17 CPU(s):    68-71
-NUMA node18 CPU(s):    72-75
-NUMA node19 CPU(s):    76-79
-NUMA node20 CPU(s):    80-83
-NUMA node21 CPU(s):    84-87
-NUMA node22 CPU(s):    88-91
-NUMA node23 CPU(s):    92-95
-NUMA node24 CPU(s):    96-99
-NUMA node25 CPU(s):    100-103
-NUMA node26 CPU(s):    104-107
-NUMA node27 CPU(s):    108-111
-NUMA node28 CPU(s):    112-115
-NUMA node29 CPU(s):    116-119
-NUMA node30 CPU(s):    120-123
-NUMA node31 CPU(s):    124-127
-NUMA node32 CPU(s):    128-131
-NUMA node33 CPU(s):    132-135
-NUMA node34 CPU(s):    136-139
-NUMA node35 CPU(s):    140-143
-NUMA node36 CPU(s):    144-147
-NUMA node37 CPU(s):    148-151
-NUMA node38 CPU(s):    152-155
-NUMA node39 CPU(s):    156-159
-NUMA node40 CPU(s):    160-163
-NUMA node41 CPU(s):    164-167
-NUMA node42 CPU(s):    168-171
-NUMA node43 CPU(s):    172-175
-NUMA node44 CPU(s):    176-179
-NUMA node45 CPU(s):    180-183
-NUMA node46 CPU(s):    184-187
-NUMA node47 CPU(s):    188-191
-NUMA node48 CPU(s):    192-195
-NUMA node49 CPU(s):    196-199
-NUMA node50 CPU(s):    200-203
-NUMA node51 CPU(s):    204-207
-NUMA node52 CPU(s):    208-211
-NUMA node53 CPU(s):    212-215
-NUMA node54 CPU(s):    216-219
-NUMA node55 CPU(s):    220-223
-NUMA node56 CPU(s):    224-227
-NUMA node57 CPU(s):    228-231
-NUMA node58 CPU(s):    232-235
-NUMA node59 CPU(s):    236-239
-NUMA node60 CPU(s):    240-243
-NUMA node61 CPU(s):    244-247
-NUMA node62 CPU(s):    248-251
-NUMA node63 CPU(s):    252-255
-NUMA node64 CPU(s):    256-259
-NUMA node65 CPU(s):    260-263
-NUMA node66 CPU(s):    264-267
-NUMA node67 CPU(s):    268-271
-NUMA node68 CPU(s):    272-275
-NUMA node69 CPU(s):    276-279
-NUMA node70 CPU(s):    280-283
-NUMA node71 CPU(s):    284-287
-NUMA node72 CPU(s):    288-291
-NUMA node73 CPU(s):    292-295
-NUMA node74 CPU(s):    296-299
-NUMA node75 CPU(s):    300-303
-NUMA node76 CPU(s):    304-307
-NUMA node77 CPU(s):    308-311
-NUMA node78 CPU(s):    312-315
-NUMA node79 CPU(s):    316-319
-NUMA node80 CPU(s):    320-323
-NUMA node81 CPU(s):    324-327
-NUMA node82 CPU(s):    328-331
-NUMA node83 CPU(s):    332-335
-NUMA node84 CPU(s):    336-339
-NUMA node85 CPU(s):    340-343
-NUMA node86 CPU(s):    344-347
-NUMA node87 CPU(s):    348-351
-NUMA node88 CPU(s):    352-355
-NUMA node89 CPU(s):    356-359
-NUMA node90 CPU(s):    360-363
-NUMA node91 CPU(s):    364-367
-NUMA node92 CPU(s):    368-371
-NUMA node93 CPU(s):    372-375
-NUMA node94 CPU(s):    376-379
-NUMA node95 CPU(s):    380-383
-NUMA node96 CPU(s):    384-387
-NUMA node97 CPU(s):    388-391
-NUMA node98 CPU(s):    392-395
-NUMA node99 CPU(s):    396-399
-NUMA node100 CPU(s):   400-403
-NUMA node101 CPU(s):   404-407
-NUMA node102 CPU(s):   408-411
-NUMA node103 CPU(s):   412-415
-NUMA node104 CPU(s):   416-419
-NUMA node105 CPU(s):   420-423
-NUMA node106 CPU(s):   424-427
-NUMA node107 CPU(s):   428-431
-NUMA node108 CPU(s):   432-435
-NUMA node109 CPU(s):   436-439
-NUMA node110 CPU(s):   440-443
-NUMA node111 CPU(s):   444-447
-NUMA node112 CPU(s):   448-451
-NUMA node113 CPU(s):   452-455
-NUMA node114 CPU(s):   456-459
-NUMA node115 CPU(s):   460-463
-NUMA node116 CPU(s):   464-467
-NUMA node117 CPU(s):   468-471
-NUMA node118 CPU(s):   472-475
-NUMA node119 CPU(s):   476-479
-NUMA node120 CPU(s):   480-483
-NUMA node121 CPU(s):   484-487
-NUMA node122 CPU(s):   488-491
-NUMA node123 CPU(s):   492-495
-NUMA node124 CPU(s):   496-499
-NUMA node125 CPU(s):   500-503
-NUMA node126 CPU(s):   504-507
-NUMA node127 CPU(s):   508-511
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node
-0,0,0,0
-1,1,0,0
-2,2,1,0
-3,3,1,0
-4,4,2,1
-5,5,2,1
-6,6,3,1
-7,7,3,1
-8,8,4,2
-9,9,4,2
-10,10,5,2
-11,11,5,2
-12,12,6,3
-13,13,6,3
-14,14,7,3
-15,15,7,3
-16,16,8,4
-17,17,8,4
-18,18,9,4
-19,19,9,4
-20,20,10,5
-21,21,10,5
-22,22,11,5
-23,23,11,5
-24,24,12,6
-25,25,12,6
-26,26,13,6
-27,27,13,6
-28,28,14,7
-29,29,14,7
-30,30,15,7
-31,31,15,7
-32,32,16,8
-33,33,16,8
-34,34,17,8
-35,35,17,8
-36,36,18,9
-37,37,18,9
-38,38,19,9
-39,39,19,9
-40,40,20,10
-41,41,20,10
-42,42,21,10
-43,43,21,10
-44,44,22,11
-45,45,22,11
-46,46,23,11
-47,47,23,11
-48,48,24,12
-49,49,24,12
-50,50,25,12
-51,51,25,12
-52,52,26,13
-53,53,26,13
-54,54,27,13
-55,55,27,13
-56,56,28,14
-57,57,28,14
-58,58,29,14
-59,59,29,14
-60,60,30,15
-61,61,30,15
-62,62,31,15
-63,63,31,15
-64,64,32,16
-65,65,32,16
-66,66,33,16
-67,67,33,16
-68,68,34,17
-69,69,34,17
-70,70,35,17
-71,71,35,17
-72,72,36,18
-73,73,36,18
-74,74,37,18
-75,75,37,18
-76,76,38,19
-77,77,38,19
-78,78,39,19
-79,79,39,19
-80,80,40,20
-81,81,40,20
-82,82,41,20
-83,83,41,20
-84,84,42,21
-85,85,42,21
-86,86,43,21
-87,87,43,21
-88,88,44,22
-89,89,44,22
-90,90,45,22
-91,91,45,22
-92,92,46,23
-93,93,46,23
-94,94,47,23
-95,95,47,23
-96,96,48,24
-97,97,48,24
-98,98,49,24
-99,99,49,24
-100,100,50,25
-101,101,50,25
-102,102,51,25
-103,103,51,25
-104,104,52,26
-105,105,52,26
-106,106,53,26
-107,107,53,26
-108,108,54,27
-109,109,54,27
-110,110,55,27
-111,111,55,27
-112,112,56,28
-113,113,56,28
-114,114,57,28
-115,115,57,28
-116,116,58,29
-117,117,58,29
-118,118,59,29
-119,119,59,29
-120,120,60,30
-121,121,60,30
-122,122,61,30
-123,123,61,30
-124,124,62,31
-125,125,62,31
-126,126,63,31
-127,127,63,31
-128,128,64,32
-129,129,64,32
-130,130,65,32
-131,131,65,32
-132,132,66,33
-133,133,66,33
-134,134,67,33
-135,135,67,33
-136,136,68,34
-137,137,68,34
-138,138,69,34
-139,139,69,34
-140,140,70,35
-141,141,70,35
-142,142,71,35
-143,143,71,35
-144,144,72,36
-145,145,72,36
-146,146,73,36
-147,147,73,36
-148,148,74,37
-149,149,74,37
-150,150,75,37
-151,151,75,37
-152,152,76,38
-153,153,76,38
-154,154,77,38
-155,155,77,38
-156,156,78,39
-157,157,78,39
-158,158,79,39
-159,159,79,39
-160,160,80,40
-161,161,80,40
-162,162,81,40
-163,163,81,40
-164,164,82,41
-165,165,82,41
-166,166,83,41
-167,167,83,41
-168,168,84,42
-169,169,84,42
-170,170,85,42
-171,171,85,42
-172,172,86,43
-173,173,86,43
-174,174,87,43
-175,175,87,43
-176,176,88,44
-177,177,88,44
-178,178,89,44
-179,179,89,44
-180,180,90,45
-181,181,90,45
-182,182,91,45
-183,183,91,45
-184,184,92,46
-185,185,92,46
-186,186,93,46
-187,187,93,46
-188,188,94,47
-189,189,94,47
-190,190,95,47
-191,191,95,47
-192,192,96,48
-193,193,96,48
-194,194,97,48
-195,195,97,48
-196,196,98,49
-197,197,98,49
-198,198,99,49
-199,199,99,49
-200,200,100,50
-201,201,100,50
-202,202,101,50
-203,203,101,50
-204,204,102,51
-205,205,102,51
-206,206,103,51
-207,207,103,51
-208,208,104,52
-209,209,104,52
-210,210,105,52
-211,211,105,52
-212,212,106,53
-213,213,106,53
-214,214,107,53
-215,215,107,53
-216,216,108,54
-217,217,108,54
-218,218,109,54
-219,219,109,54
-220,220,110,55
-221,221,110,55
-222,222,111,55
-223,223,111,55
-224,224,112,56
-225,225,112,56
-226,226,113,56
-227,227,113,56
-228,228,114,57
-229,229,114,57
-230,230,115,57
-231,231,115,57
-232,232,116,58
-233,233,116,58
-234,234,117,58
-235,235,117,58
-236,236,118,59
-237,237,118,59
-238,238,119,59
-239,239,119,59
-240,240,120,60
-241,241,120,60
-242,242,121,60
-243,243,121,60
-244,244,122,61
-245,245,122,61
-246,246,123,61
-247,247,123,61
-248,248,124,62
-249,249,124,62
-250,250,125,62
-251,251,125,62
-252,252,126,63
-253,253,126,63
-254,254,127,63
-255,255,127,63
-256,256,128,64
-257,257,128,64
-258,258,129,64
-259,259,129,64
-260,260,130,65
-261,261,130,65
-262,262,131,65
-263,263,131,65
-264,264,132,66
-265,265,132,66
-266,266,133,66
-267,267,133,66
-268,268,134,67
-269,269,134,67
-270,270,135,67
-271,271,135,67
-272,272,136,68
-273,273,136,68
-274,274,137,68
-275,275,137,68
-276,276,138,69
-277,277,138,69
-278,278,139,69
-279,279,139,69
-280,280,140,70
-281,281,140,70
-282,282,141,70
-283,283,141,70
-284,284,142,71
-285,285,142,71
-286,286,143,71
-287,287,143,71
-288,288,144,72
-289,289,144,72
-290,290,145,72
-291,291,145,72
-292,292,146,73
-293,293,146,73
-294,294,147,73
-295,295,147,73
-296,296,148,74
-297,297,148,74
-298,298,149,74
-299,299,149,74
-300,300,150,75
-301,301,150,75
-302,302,151,75
-303,303,151,75
-304,304,152,76
-305,305,152,76
-306,306,153,76
-307,307,153,76
-308,308,154,77
-309,309,154,77
-310,310,155,77
-311,311,155,77
-312,312,156,78
-313,313,156,78
-314,314,157,78
-315,315,157,78
-316,316,158,79
-317,317,158,79
-318,318,159,79
-319,319,159,79
-320,320,160,80
-321,321,160,80
-322,322,161,80
-323,323,161,80
-324,324,162,81
-325,325,162,81
-326,326,163,81
-327,327,163,81
-328,328,164,82
-329,329,164,82
-330,330,165,82
-331,331,165,82
-332,332,166,83
-333,333,166,83
-334,334,167,83
-335,335,167,83
-336,336,168,84
-337,337,168,84
-338,338,169,84
-339,339,169,84
-340,340,170,85
-341,341,170,85
-342,342,171,85
-343,343,171,85
-344,344,172,86
-345,345,172,86
-346,346,173,86
-347,347,173,86
-348,348,174,87
-349,349,174,87
-350,350,175,87
-351,351,175,87
-352,352,176,88
-353,353,176,88
-354,354,177,88
-355,355,177,88
-356,356,178,89
-357,357,178,89
-358,358,179,89
-359,359,179,89
-360,360,180,90
-361,361,180,90
-362,362,181,90
-363,363,181,90
-364,364,182,91
-365,365,182,91
-366,366,183,91
-367,367,183,91
-368,368,184,92
-369,369,184,92
-370,370,185,92
-371,371,185,92
-372,372,186,93
-373,373,186,93
-374,374,187,93
-375,375,187,93
-376,376,188,94
-377,377,188,94
-378,378,189,94
-379,379,189,94
-380,380,190,95
-381,381,190,95
-382,382,191,95
-383,383,191,95
-384,384,192,96
-385,385,192,96
-386,386,193,96
-387,387,193,96
-388,388,194,97
-389,389,194,97
-390,390,195,97
-391,391,195,97
-392,392,196,98
-393,393,196,98
-394,394,197,98
-395,395,197,98
-396,396,198,99
-397,397,198,99
-398,398,199,99
-399,399,199,99
-400,400,200,100
-401,401,200,100
-402,402,201,100
-403,403,201,100
-404,404,202,101
-405,405,202,101
-406,406,203,101
-407,407,203,101
-408,408,204,102
-409,409,204,102
-410,410,205,102
-411,411,205,102
-412,412,206,103
-413,413,206,103
-414,414,207,103
-415,415,207,103
-416,416,208,104
-417,417,208,104
-418,418,209,104
-419,419,209,104
-420,420,210,105
-421,421,210,105
-422,422,211,105
-423,423,211,105
-424,424,212,106
-425,425,212,106
-426,426,213,106
-427,427,213,106
-428,428,214,107
-429,429,214,107
-430,430,215,107
-431,431,215,107
-432,432,216,108
-433,433,216,108
-434,434,217,108
-435,435,217,108
-436,436,218,109
-437,437,218,109
-438,438,219,109
-439,439,219,109
-440,440,220,110
-441,441,220,110
-442,442,221,110
-443,443,221,110
-444,444,222,111
-445,445,222,111
-446,446,223,111
-447,447,223,111
-448,448,224,112
-449,449,224,112
-450,450,225,112
-451,451,225,112
-452,452,226,113
-453,453,226,113
-454,454,227,113
-455,455,227,113
-456,456,228,114
-457,457,228,114
-458,458,229,114
-459,459,229,114
-460,460,230,115
-461,461,230,115
-462,462,231,115
-463,463,231,115
-464,464,232,116
-465,465,232,116
-466,466,233,116
-467,467,233,116
-468,468,234,117
-469,469,234,117
-470,470,235,117
-471,471,235,117
-472,472,236,118
-473,473,236,118
-474,474,237,118
-475,475,237,118
-476,476,238,119
-477,477,238,119
-478,478,239,119
-479,479,239,119
-480,480,240,120
-481,481,240,120
-482,482,241,120
-483,483,241,120
-484,484,242,121
-485,485,242,121
-486,486,243,121
-487,487,243,121
-488,488,244,122
-489,489,244,122
-490,490,245,122
-491,491,245,122
-492,492,246,123
-493,493,246,123
-494,494,247,123
-495,495,247,123
-496,496,248,124
-497,497,248,124
-498,498,249,124
-499,499,249,124
-500,500,250,125
-501,501,250,125
-502,502,251,125
-503,503,251,125
-504,504,252,126
-505,505,252,126
-506,506,253,126
-507,507,253,126
-508,508,254,127
-509,509,254,127
-510,510,255,127
-511,511,255,127
diff --git a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
deleted file mode 100644
index 03226226f..000000000
--- a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
+++ /dev/null
@@ -1,29 +0,0 @@
-CPU(s):                8
-Thread(s) per core:    1
-Core(s) per socket:    1
-Socket(s):             8
-NUMA node(s):          3
-Vendor ID:             GenuineIntel
-CPU family:            Itanium 2
-Model:                 1
-CPU MHz:               1300.000000
-L1d cache:             16K
-L1i cache:             16K
-L2 cache:              256K
-L3 cache:              3072K
-NUMA node0 CPU(s):     4-7
-NUMA node1 CPU(s):     0-3
-NUMA node2 CPU(s):     
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,1,,0,0,0,0
-1,1,1,1,,1,1,1,1
-2,2,2,1,,2,2,2,2
-3,3,3,1,,3,3,3,3
-4,4,4,0,,4,4,4,4
-5,5,5,0,,5,5,5,5
-6,6,6,0,,6,6,6,6
-7,7,7,0,,7,7,7,7
diff --git a/tests/expected/lscpu/lscpu-ia64-hprx1620 b/tests/expected/lscpu/lscpu-ia64-hprx1620
deleted file mode 100644
index 92aa9079b..000000000
--- a/tests/expected/lscpu/lscpu-ia64-hprx1620
+++ /dev/null
@@ -1,21 +0,0 @@
-CPU(s):                2
-Thread(s) per core:    1
-Core(s) per socket:    1
-Socket(s):             2
-NUMA node(s):          1
-Vendor ID:             GenuineIntel
-CPU family:            Itanium 2
-Model:                 2
-CPU MHz:               1599.000967
-L1d cache:             16K
-L1i cache:             16K
-L2 cache:              256K
-L3 cache:              3072K
-NUMA node0 CPU(s):     0,1
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,0,,1,1,1,1
diff --git a/tests/expected/lscpu/lscpu-ia64-pg0 b/tests/expected/lscpu/lscpu-ia64-pg0
deleted file mode 100644
index 50942ccc0..000000000
--- a/tests/expected/lscpu/lscpu-ia64-pg0
+++ /dev/null
@@ -1,37 +0,0 @@
-CPU(s):                16
-Thread(s) per core:    1
-Core(s) per socket:    2
-Socket(s):             8
-NUMA node(s):          2
-Vendor ID:             GenuineIntel
-CPU family:            Itanium 2
-Model:                 0
-CPU MHz:               1418.000227
-L1d cache:             16K
-L1i cache:             16K
-L2d cache:             256K
-L2i cache:             1024K
-L3 cache:              6144K
-NUMA node0 CPU(s):     0-7
-NUMA node1 CPU(s):     8-15
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i,L3
-0,0,0,0,,0,0,0,,
-1,1,0,0,,1,1,1,,
-2,2,1,0,,2,2,2,,
-3,3,1,0,,3,3,3,,
-4,4,2,0,,4,4,4,,
-5,5,2,0,,5,5,5,,
-6,6,3,0,,6,6,6,,
-7,7,3,0,,7,7,7,,
-8,8,4,1,,8,8,8,,
-9,9,4,1,,9,9,9,,
-10,10,5,1,,10,10,10,,
-11,11,5,1,,11,11,11,,
-12,12,6,1,,12,12,12,,
-13,13,6,1,,13,13,13,,
-14,14,7,1,,14,14,14,,
-15,15,7,1,,15,15,15,,
diff --git a/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1 b/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1
deleted file mode 100644
index 639a7de20..000000000
--- a/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1
+++ /dev/null
@@ -1,38 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                32
-On-line CPU(s) list:   0-23
-Off-line CPU(s) list:  24-31
-Thread(s) per core:    4
-Core(s) per socket:    1
-Socket(s):             6
-NUMA node(s):          1
-NUMA node0 CPU(s):     0-35
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node
-0,0,0,0
-1,0,0,0
-2,0,0,0
-3,0,0,0
-4,1,1,0
-5,1,1,0
-6,1,1,0
-7,1,1,0
-8,2,2,0
-9,2,2,0
-10,2,2,0
-11,2,2,0
-12,3,3,0
-13,3,3,0
-14,3,3,0
-15,3,3,0
-16,4,4,0
-17,4,4,0
-18,4,4,0
-19,4,4,0
-20,5,5,0
-21,5,5,0
-22,5,5,0
-23,5,5,0
diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_poweredge1950 b/tests/expected/lscpu/lscpu-x86_64-dell_poweredge1950
deleted file mode 100644
index 64c5a9cd0..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-dell_poweredge1950
+++ /dev/null
@@ -1,23 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                8
-NUMA node(s):          1
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 15
-Stepping:              7
-CPU MHz:               2327.526
-BogoMIPS:              4655.08
-NUMA node0 CPU(s):     0-7
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node
-0,,,0
-1,,,0
-2,,,0
-3,,,0
-4,,,0
-5,,,0
-6,,,0
-7,,,0
diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610 b/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610
deleted file mode 100644
index bdd839f41..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610
+++ /dev/null
@@ -1,40 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                16
-Thread(s) per core:    2
-Core(s) per socket:    4
-Socket(s):             2
-NUMA node(s):          2
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 26
-Stepping:              5
-CPU MHz:               2261.056
-BogoMIPS:              4522.04
-Virtualization:        VT-x
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              256K
-L3 cache:              8192K
-NUMA node0 CPU(s):     0,2,4,6,8,10,12,14
-NUMA node1 CPU(s):     1,3,5,7,9,11,13,15
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,1,,1,1,1,1
-2,2,0,0,,2,2,2,0
-3,3,1,1,,3,3,3,1
-4,4,0,0,,4,4,4,0
-5,5,1,1,,5,5,5,1
-6,6,0,0,,6,6,6,0
-7,7,1,1,,7,7,7,1
-8,0,0,0,,0,0,0,0
-9,1,1,1,,1,1,1,1
-10,2,0,0,,2,2,2,0
-11,3,1,1,,3,3,3,1
-12,4,0,0,,4,4,4,0
-13,5,1,1,,5,5,5,1
-14,6,0,0,,6,6,6,0
-15,7,1,1,,7,7,7,1
diff --git a/tests/expected/lscpu/lscpu-x86_64-dellr710 b/tests/expected/lscpu/lscpu-x86_64-dellr710
deleted file mode 100644
index 3b52c6de3..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-dellr710
+++ /dev/null
@@ -1,40 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                16
-Thread(s) per core:    2
-Core(s) per socket:    4
-Socket(s):             2
-NUMA node(s):          2
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 26
-Stepping:              5
-CPU MHz:               2527.073
-BogoMIPS:              5053.32
-Virtualization:        VT-x
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              256K
-L3 cache:              8192K
-NUMA node0 CPU(s):     0,2,4,6,8,10,12,14
-NUMA node1 CPU(s):     1,3,5,7,9,11,13,15
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,1,,1,1,1,1
-2,2,0,0,,2,2,2,0
-3,3,1,1,,3,3,3,1
-4,4,0,0,,4,4,4,0
-5,5,1,1,,5,5,5,1
-6,6,0,0,,6,6,6,0
-7,7,1,1,,7,7,7,1
-8,0,0,0,,0,0,0,0
-9,1,1,1,,1,1,1,1
-10,2,0,0,,2,2,2,0
-11,3,1,1,,3,3,3,1
-12,4,0,0,,4,4,4,0
-13,5,1,1,,5,5,5,1
-14,6,0,0,,6,6,6,0
-15,7,1,1,,7,7,7,1
diff --git a/tests/expected/lscpu/lscpu-x86_64-el5xen b/tests/expected/lscpu/lscpu-x86_64-el5xen
deleted file mode 100644
index 454ca35de..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-el5xen
+++ /dev/null
@@ -1,30 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                8
-Thread(s) per core:    1
-Core(s) per socket:    1
-Socket(s):             8
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 26
-Stepping:              5
-CPU MHz:               2393.998
-BogoMIPS:              5986.29
-Hypervisor vendor:     Xen
-Virtualization type:   para
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              256K
-L3 cache:              8192K
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,,,0,0,0,0
-1,1,1,,,0,0,0,0
-2,2,2,,,1,1,1,0
-3,3,3,,,1,1,1,0
-4,4,4,,,2,2,2,0
-5,5,5,,,2,2,2,0
-6,6,6,,,3,3,3,0
-7,7,7,,,3,3,3,0
diff --git a/tests/expected/lscpu/lscpu-x86_64-hpdl585 b/tests/expected/lscpu/lscpu-x86_64-hpdl585
deleted file mode 100644
index 347ee62ba..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-hpdl585
+++ /dev/null
@@ -1,42 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                16
-Thread(s) per core:    1
-Core(s) per socket:    4
-Socket(s):             4
-NUMA node(s):          4
-Vendor ID:             AuthenticAMD
-CPU family:            16
-Model:                 2
-Stepping:              3
-CPU MHz:               2210.188
-BogoMIPS:              4420.50
-Virtualization:        AMD-V
-L1d cache:             512K
-L1i cache:             512K
-L2 cache:              512K
-L3 cache:              2048K
-NUMA node0 CPU(s):     0,4,8,12
-NUMA node1 CPU(s):     1,5,9,13
-NUMA node2 CPU(s):     2,6,10,14
-NUMA node3 CPU(s):     3,7,11,15
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,1,,1,1,1,1
-2,2,2,2,,2,2,2,2
-3,3,3,3,,3,3,3,3
-4,4,0,0,,4,4,4,4
-5,5,1,1,,5,5,5,5
-6,6,2,2,,6,6,6,6
-7,7,3,3,,7,7,7,7
-8,8,0,0,,8,8,8,8
-9,9,1,1,,9,9,9,9
-10,10,2,2,,10,10,10,10
-11,11,3,3,,11,11,11,11
-12,12,0,0,,12,12,12,12
-13,13,1,1,,13,13,13,13
-14,14,2,2,,14,14,14,14
-15,15,3,3,,15,15,15,15
diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m
deleted file mode 100644
index 8e5e37542..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-ibme326m
+++ /dev/null
@@ -1,23 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                2
-Thread(s) per core:    1
-Core(s) per socket:    2
-Socket(s):             1
-NUMA node(s):          1
-Vendor ID:             AuthenticAMD
-CPU family:            15
-Model:                 33
-Stepping:              2
-CPU MHz:               1995.058
-BogoMIPS:              3989.41
-L1d cache:             1024K
-L1i cache:             1024K
-L2 cache:              1024K
-NUMA node0 CPU(s):     0,1
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2
-0,0,0,0,,0,0,0
-1,1,0,0,,1,1,1
diff --git a/tests/expected/lscpu/lscpu-x86_64-necem14 b/tests/expected/lscpu/lscpu-x86_64-necem14
deleted file mode 100644
index 91d626e10..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-necem14
+++ /dev/null
@@ -1,22 +0,0 @@
-CPU op-mode(s):        32-bit, 64-bit
-CPU(s):                2
-Thread(s) per core:    2
-Core(s) per socket:    1
-Socket(s):             1
-NUMA node(s):          1
-Vendor ID:             GenuineIntel
-CPU family:            15
-Model:                 4
-Stepping:              3
-CPU MHz:               3790.599
-BogoMIPS:              7579.94
-L1d cache:             16K
-L2 cache:              2048K
-NUMA node0 CPU(s):     0,1
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L2
-0,0,0,0,,0,0
-1,0,0,0,,0,0
diff --git a/tests/expected/lscpu/lscpu-x86_64-xenfull b/tests/expected/lscpu/lscpu-x86_64-xenfull
deleted file mode 100644
index 1a5c46a79..000000000
--- a/tests/expected/lscpu/lscpu-x86_64-xenfull
+++ /dev/null
@@ -1,22 +0,0 @@
-CPU(s):                2
-Thread(s) per core:    1
-Core(s) per socket:    1
-CPU socket(s):         2
-NUMA node(s):          1
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 23
-Stepping:              6
-CPU MHz:               2493.900
-Hypervisor vendor:     Xen
-Virtualization type:   full
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              6144K
-
-# The following is the parsable format, which can be fed to other
-# programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1i,L2
-0,0,0,0,,0,0,0
-1,1,1,0,,1,1,1