From: Karel Zak Date: Wed, 27 Jul 2011 21:41:10 +0000 (+0200) Subject: tests: update lscpu tests X-Git-Tag: v2.20-rc1~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd2ac5b9596d66dc4b7be629b6c9d1571f41bca4;p=thirdparty%2Futil-linux.git tests: update lscpu tests Signed-off-by: Karel Zak --- diff --git a/tests/expected/lscpu/lscpu-i386-amdshanghai b/tests/expected/lscpu/lscpu-i386-amdshanghai index 5f2d74ec6b..25dcaa974a 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 8e9f62059f..77c30afc62 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 24ca496af3..bc64565736 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 6d3121344f..0de3ff4177 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 f7a3844555..03226226f6 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 4812be6af7..92aa9079b9 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 22c4539c1a..50942ccc09 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 b8a0b4b0d7..0d6c5ba2f1 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 e54f8c6987..639a7de200 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 7131e3efd6..ae9e0b4940 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 55791ce7da..bdd839f419 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 d436f22f14..3b52c6de38 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 c801b23509..454ca35dee 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 7e496d2e35..347ee62ba0 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 d6774a6adf..8e5e375426 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 d3c4f1baaf..91d626e102 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