From 28f3c81943dc806e82d8ef5c235dfec60cd96580 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 17 Jan 2022 14:10:36 +0100 Subject: [PATCH] tests: update lscpu output References: f592b88d0cd965e20ca1f492cadb3b8c8fd48a40 Signed-off-by: Karel Zak --- sys-utils/lscpu.c | 3 ++- tests/expected/lscpu/lscpu-s390-kvm | 1 + tests/expected/lscpu/lscpu-s390-lpar | 1 + tests/expected/lscpu/lscpu-s390-lpar-drawer | 1 + tests/expected/lscpu/lscpu-s390-nested-virt | 1 + tests/expected/lscpu/lscpu-s390-zvm | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 32f989e381..4e2f671f2e 100644 --- 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 3e5d98a4a6..51e276cc14 100644 --- 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 018a30a2c2..25a1918947 100644 --- 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 099a5bb584..467a76dc57 100644 --- 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 fb413c3e9e..7e567931ed 100644 --- 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 da5d9abd37..c7e749952e 100644 --- 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 -- 2.47.3