summaryrefslogtreecommitdiffstats
path: root/tests/expected/lscpu
diff options
context:
space:
mode:
authorKarel Zak2011-07-27 23:41:10 +0200
committerKarel Zak2011-07-27 23:41:10 +0200
commitcd2ac5b9596d66dc4b7be629b6c9d1571f41bca4 (patch)
treedd0ce0b5043ebd10770c522314fa091c797a6534 /tests/expected/lscpu
parentlscpu: extend --parse functionality (diff)
downloadkernel-qcow2-util-linux-cd2ac5b9596d66dc4b7be629b6c9d1571f41bca4.tar.gz
kernel-qcow2-util-linux-cd2ac5b9596d66dc4b7be629b6c9d1571f41bca4.tar.xz
kernel-qcow2-util-linux-cd2ac5b9596d66dc4b7be629b6c9d1571f41bca4.zip
tests: update lscpu tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/expected/lscpu')
-rw-r--r--tests/expected/lscpu/lscpu-i386-amdshanghai2
-rw-r--r--tests/expected/lscpu/lscpu-i386-dellpe7002
-rw-r--r--tests/expected/lscpu/lscpu-i386-intels5000phb2
-rw-r--r--tests/expected/lscpu/lscpu-ia64-512cpus2
-rw-r--r--tests/expected/lscpu/lscpu-ia64-hpmatterhorn2
-rw-r--r--tests/expected/lscpu/lscpu-ia64-hprx16202
-rw-r--r--tests/expected/lscpu/lscpu-ia64-pg02
-rw-r--r--tests/expected/lscpu/lscpu-ppc64-POWER72
-rw-r--r--tests/expected/lscpu/lscpu-sparc64-UltraSparc-T12
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-dell_e43102
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-dell_poweredgeR6102
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-dellr7102
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-el5xen2
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-hpdl5852
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-ibme326m2
-rw-r--r--tests/expected/lscpu/lscpu-x86_64-necem142
16 files changed, 16 insertions, 16 deletions
diff --git a/tests/expected/lscpu/lscpu-i386-amdshanghai b/tests/expected/lscpu/lscpu-i386-amdshanghai
index 5f2d74ec6..25dcaa974 100644
--- 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 8e9f62059..77c30afc6 100644
--- 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 24ca496af..bc6456573 100644
--- 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 6d3121344..0de3ff417 100644
--- 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 f7a384455..03226226f 100644
--- 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 4812be6af..92aa9079b 100644
--- 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 22c4539c1..50942ccc0 100644
--- 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 b8a0b4b0d..0d6c5ba2f 100644
--- 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 e54f8c698..639a7de20 100644
--- 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 7131e3efd..ae9e0b494 100644
--- 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 55791ce7d..bdd839f41 100644
--- 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 d436f22f1..3b52c6de3 100644
--- 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 c801b2350..454ca35de 100644
--- 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 7e496d2e3..347ee62ba 100644
--- 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 d6774a6ad..8e5e37542 100644
--- 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 d3c4f1baa..91d626e10 100644
--- 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