tests: update lscpu tests

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/lscpu/lscpu-i386-amdshanghai b/tests/expected/lscpu/lscpu-i386-amdshanghai
index 5f2d74ec6b8f4b909d25be8b6bd002fc77407a96..25dcaa974abb861964d13c96993e80d2d4dacdf5 100644 (file)
--- a/tests/expected/lscpu/lscpu-i386-amdshanghai
+++ b/tests/expected/lscpu/lscpu-i386-amdshanghai
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                8
 Thread(s) per core:    1
 Core(s) per socket:    4
-CPU socket(s):         2
+Socket(s):             2
 Vendor ID:             AuthenticAMD
 CPU family:            16
 Model:                 4

diff --git a/tests/expected/lscpu/lscpu-i386-dellpe700 b/tests/expected/lscpu/lscpu-i386-dellpe700
index 8e9f62059f5525e087f9444cbf30e5b7c8245c23..77c30afc626d7b9f044d84ba83c616db43ba0ad1 100644 (file)
--- a/tests/expected/lscpu/lscpu-i386-dellpe700
+++ b/tests/expected/lscpu/lscpu-i386-dellpe700
@@ -1,7 +1,7 @@
 CPU(s):                2
 Thread(s) per core:    2
 Core(s) per socket:    1
-CPU socket(s):         1
+Socket(s):             1
 Vendor ID:             GenuineIntel
 CPU family:            15
 Model:                 2

diff --git a/tests/expected/lscpu/lscpu-i386-intels5000phb b/tests/expected/lscpu/lscpu-i386-intels5000phb
index 24ca496af348c52461f1fde5c68d487061bd4a6a..bc64565736d5616d45635f441ebb2434abb137fd 100644 (file)
--- a/tests/expected/lscpu/lscpu-i386-intels5000phb
+++ b/tests/expected/lscpu/lscpu-i386-intels5000phb
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                8
 Thread(s) per core:    1
 Core(s) per socket:    4
-CPU socket(s):         2
+Socket(s):             2
 Vendor ID:             GenuineIntel
 CPU family:            6
 Model:                 15

diff --git a/tests/expected/lscpu/lscpu-ia64-512cpus b/tests/expected/lscpu/lscpu-ia64-512cpus
index 6d3121344f6b5f44a6ac75a9d1db0c4509508f57..0de3ff4177eb602e819f8b347333e42ccb2164a6 100644 (file)
--- a/tests/expected/lscpu/lscpu-ia64-512cpus
+++ b/tests/expected/lscpu/lscpu-ia64-512cpus
@@ -1,7 +1,7 @@
 CPU(s):                512
 Thread(s) per core:    1
 Core(s) per socket:    2
-CPU socket(s):         256
+Socket(s):             256
 NUMA node(s):          128
 Vendor ID:             GenuineIntel
 CPU family:            32

diff --git a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
index f7a3844555dda3a284501884c5eb6de8ea115674..03226226f68fe87674c4295fe740ef21a6a55864 100644 (file)
--- a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
+++ b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
@@ -1,7 +1,7 @@
 CPU(s):                8
 Thread(s) per core:    1
 Core(s) per socket:    1
-CPU socket(s):         8
+Socket(s):             8
 NUMA node(s):          3
 Vendor ID:             GenuineIntel
 CPU family:            Itanium 2

diff --git a/tests/expected/lscpu/lscpu-ia64-hprx1620 b/tests/expected/lscpu/lscpu-ia64-hprx1620
index 4812be6af76453ad226443a1257376e53750ea72..92aa9079b9678078ab6e97ac4c42120b26a42c05 100644 (file)
--- a/tests/expected/lscpu/lscpu-ia64-hprx1620
+++ b/tests/expected/lscpu/lscpu-ia64-hprx1620
@@ -1,7 +1,7 @@
 CPU(s):                2
 Thread(s) per core:    1
 Core(s) per socket:    1
-CPU socket(s):         2
+Socket(s):             2
 NUMA node(s):          1
 Vendor ID:             GenuineIntel
 CPU family:            Itanium 2

diff --git a/tests/expected/lscpu/lscpu-ia64-pg0 b/tests/expected/lscpu/lscpu-ia64-pg0
index 22c4539c1a4443876bc6e548c82e22afef944d1f..50942ccc09000a87f368b6ebb682e47e43c4814b 100644 (file)
--- a/tests/expected/lscpu/lscpu-ia64-pg0
+++ b/tests/expected/lscpu/lscpu-ia64-pg0
@@ -1,7 +1,7 @@
 CPU(s):                16
 Thread(s) per core:    1
 Core(s) per socket:    2
-CPU socket(s):         8
+Socket(s):             8
 NUMA node(s):          2
 Vendor ID:             GenuineIntel
 CPU family:            Itanium 2

diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7 b/tests/expected/lscpu/lscpu-ppc64-POWER7
index b8a0b4b0d749b59d7dd7a868db119672e4826629..0d6c5ba2f14b36b2a0c11e26fe69a4e9e8f7e33a 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc64-POWER7
+++ b/tests/expected/lscpu/lscpu-ppc64-POWER7
@@ -2,7 +2,7 @@ CPU(s):                16
 On-line CPU(s) list:   0-15
 Thread(s) per core:    4
 Core(s) per socket:    1
-CPU socket(s):         4
+Socket(s):             4
 NUMA node(s):          1
 Model:                 IBM,8233-E8B
 L1d cache:             32K

diff --git a/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1 b/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1
index e54f8c69877908131c59dac28199e10c833b9140..639a7de20003236b762610ad9d6ae18f8da30bca 100644 (file)
--- a/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1
+++ b/tests/expected/lscpu/lscpu-sparc64-UltraSparc-T1
@@ -4,7 +4,7 @@ On-line CPU(s) list:   0-23
 Off-line CPU(s) list:  24-31
 Thread(s) per core:    4
 Core(s) per socket:    1
-CPU socket(s):         6
+Socket(s):             6
 NUMA node(s):          1
 NUMA node0 CPU(s):     0-35
 

diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
index 7131e3efd673de55eba34885992b447543069d10..ae9e0b4940b22fb05b36341c50126659743b086b 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
@@ -3,7 +3,7 @@ CPU(s):                4
 On-line CPU(s) list:   0-3
 Thread(s) per core:    2
 Core(s) per socket:    2
-CPU socket(s):         1
+Socket(s):             1
 NUMA node(s):          1
 Vendor ID:             GenuineIntel
 CPU family:            6

diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610 b/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610
index 55791ce7da98c9af348d0ed1c49c31400877a130..bdd839f4190f2199105857ff219ec1b0cd39113d 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR610
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                16
 Thread(s) per core:    2
 Core(s) per socket:    4
-CPU socket(s):         2
+Socket(s):             2
 NUMA node(s):          2
 Vendor ID:             GenuineIntel
 CPU family:            6

diff --git a/tests/expected/lscpu/lscpu-x86_64-dellr710 b/tests/expected/lscpu/lscpu-x86_64-dellr710
index d436f22f14c740bf72619b81cb5f72f5120e50e7..3b52c6de38198f9bb9063fce4afa22cbb57e6169 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-dellr710
+++ b/tests/expected/lscpu/lscpu-x86_64-dellr710
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                16
 Thread(s) per core:    2
 Core(s) per socket:    4
-CPU socket(s):         2
+Socket(s):             2
 NUMA node(s):          2
 Vendor ID:             GenuineIntel
 CPU family:            6

diff --git a/tests/expected/lscpu/lscpu-x86_64-el5xen b/tests/expected/lscpu/lscpu-x86_64-el5xen
index c801b23509257dfa9041f15c32625cd0beece0b3..454ca35dee1e1f4e706cef9bd2f90620d7f72b66 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-el5xen
+++ b/tests/expected/lscpu/lscpu-x86_64-el5xen
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                8
 Thread(s) per core:    1
 Core(s) per socket:    1
-CPU socket(s):         8
+Socket(s):             8
 Vendor ID:             GenuineIntel
 CPU family:            6
 Model:                 26

diff --git a/tests/expected/lscpu/lscpu-x86_64-hpdl585 b/tests/expected/lscpu/lscpu-x86_64-hpdl585
index 7e496d2e35a5bf34601c3cd90ec118ff7e4693c0..347ee62ba01c0d97a75e53dd9e2d6eb909e77da4 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-hpdl585
+++ b/tests/expected/lscpu/lscpu-x86_64-hpdl585
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                16
 Thread(s) per core:    1
 Core(s) per socket:    4
-CPU socket(s):         4
+Socket(s):             4
 NUMA node(s):          4
 Vendor ID:             AuthenticAMD
 CPU family:            16

diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m
index d6774a6adfdcf517027410ee262db571adb941fc..8e5e37542675f6f3302f134c567223a9a8490eba 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-ibme326m
+++ b/tests/expected/lscpu/lscpu-x86_64-ibme326m
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                2
 Thread(s) per core:    1
 Core(s) per socket:    2
-CPU socket(s):         1
+Socket(s):             1
 NUMA node(s):          1
 Vendor ID:             AuthenticAMD
 CPU family:            15

diff --git a/tests/expected/lscpu/lscpu-x86_64-necem14 b/tests/expected/lscpu/lscpu-x86_64-necem14
index d3c4f1baaf542de7e56cd617059e71ba7f6e5889..91d626e102b265f0733056b1510aaa620cbe45be 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-necem14
+++ b/tests/expected/lscpu/lscpu-x86_64-necem14
@@ -2,7 +2,7 @@ CPU op-mode(s):        32-bit, 64-bit
 CPU(s):                2
 Thread(s) per core:    2
 Core(s) per socket:    1
-CPU socket(s):         1
+Socket(s):             1
 NUMA node(s):          1
 Vendor ID:             GenuineIntel
 CPU family:            15