tests: update lscpu output

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

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 32f989e381c39015120e62ef499095abad687191..4e2f671f2e55b3b2ca8ad4e32a100549b1bb7618 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -859,7 +859,8 @@ print_summary_cputype(struct lscpu_cxt *cxt,
                     struct libscols_table *tb,
                     struct libscols_line *sec)
 {
-       sec = add_summary_s(tb, sec, _("Model name:"), ct->modelname ? ct->modelname : "-");
+       if (ct->modelname)
+               sec = add_summary_s(tb, sec, _("Model name:"), ct->modelname ? ct->modelname : "-");
        if (ct->bios_modelname)
                add_summary_s(tb, sec, _("BIOS Model name:"), ct->bios_modelname);
        if (ct->bios_family)

diff --git a/tests/expected/lscpu/lscpu-s390-kvm b/tests/expected/lscpu/lscpu-s390-kvm
index 3e5d98a4a66e2a92de4387a283b121743b6850f7..51e276cc14539d721e6d84b5f171ff0f7c463276 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-kvm
+++ b/tests/expected/lscpu/lscpu-s390-kvm
@@ -2,6 +2,7 @@ CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              3
 On-line CPU(s) list: 0-2
 Vendor ID:           IBM/S390
+Model name:          -
 Machine type:        2817
 Thread(s) per core:  1
 Core(s) per socket:  1

diff --git a/tests/expected/lscpu/lscpu-s390-lpar b/tests/expected/lscpu/lscpu-s390-lpar
index 018a30a2c288db6fea99a7850290ecdad014b7ef..25a191894714872fdf6ca7c667319f42592a2498 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-lpar
+++ b/tests/expected/lscpu/lscpu-s390-lpar
@@ -3,6 +3,7 @@ CPU(s):               20
 On-line CPU(s) list:  1-5,8-19
 Off-line CPU(s) list: 0,6,7
 Vendor ID:            IBM/S390
+Model name:           -
 Machine type:         2817
 Thread(s) per core:   1
 Core(s) per socket:   4

diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer
index 099a5bb5842c7eb8ad8a78badabe49071fb02d2f..467a76dc57e9b971a8dd376389b82f668a2e2983 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-lpar-drawer
+++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer
@@ -2,6 +2,7 @@ CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              8
 On-line CPU(s) list: 0-7
 Vendor ID:           IBM/S390
+Model name:          -
 Machine type:        2964
 Thread(s) per core:  1
 Core(s) per socket:  8

diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt
index fb413c3e9e18d74aafb77cc7ea640cd3a2ae1a5f..7e567931ed567ccfe9a35e2bb0a2a7e7cb00b226 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-nested-virt
+++ b/tests/expected/lscpu/lscpu-s390-nested-virt
@@ -2,6 +2,7 @@ CPU op-mode(s):                  32-bit, 64-bit
 CPU(s):                          2
 On-line CPU(s) list:             0,1
 Vendor ID:                       IBM/S390
+Model name:                      -
 Machine type:                    2964
 Thread(s) per core:              1
 Core(s) per socket:              1

diff --git a/tests/expected/lscpu/lscpu-s390-zvm b/tests/expected/lscpu/lscpu-s390-zvm
index da5d9abd37407de4a83f6bf92c91499686e6f48e..c7e749952e86764cc7d89e8c9a1f54f17a329ce8 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-zvm
+++ b/tests/expected/lscpu/lscpu-s390-zvm
@@ -2,6 +2,7 @@ CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              4
 On-line CPU(s) list: 0-3
 Vendor ID:           IBM/S390
+Model name:          -
 Machine type:        2817
 Thread(s) per core:  1
 Core(s) per socket:  1