From: Heiko Carstens Date: Wed, 22 Jun 2016 07:26:00 +0000 (+0200) Subject: lscpu: update s390-lpar-drawer testcase X-Git-Tag: v2.29-rc1~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eb9604a341871e2c10c57c6b5cd8dba54fab577;p=thirdparty%2Futil-linux.git lscpu: update s390-lpar-drawer testcase I noticed that the "cpu" line within /proc/cpuinfo has a different meaning on powerpc and sparc than on s390. On s390 it represents the cpu number while on powerpc and sparc it represent the model name. Given that the s390 kernel patch which adds the "cpu" line to /proc/cpuinfo hasn't been merged into the kernel yet, I changed that line to "cpu number" to avoid the unnecessary conflict. Therefore this patch updates the testcase, which mainly changes the contents of /proc/cpuinfo. Signed-off-by: Heiko Carstens --- diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer index 75ee33ff77..2309f1db44 100644 --- a/tests/expected/lscpu/lscpu-s390-lpar-drawer +++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer @@ -9,7 +9,6 @@ Drawer(s): 4 NUMA node(s): 1 Vendor ID: IBM/S390 Machine type: 2964 -Model name: 0 CPU dynamic MHz: 5000 CPU static MHz: 5000 BogoMIPS: 20325.00 @@ -32,7 +31,7 @@ Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i 0,0,0,0,,0,0,0,0 1,1,0,0,,1,1,1,1 -2,2,0,0,,2,2,2,2 +2,2,1,0,,2,2,2,2 3,3,1,0,,3,3,3,3 4,4,1,0,,4,4,4,4 5,5,1,0,,5,5,5,5 diff --git a/tests/ts/lscpu/dumps/s390-lpar-drawer.tar.gz b/tests/ts/lscpu/dumps/s390-lpar-drawer.tar.gz index 3386ded681..ca1bc96eb8 100644 Binary files a/tests/ts/lscpu/dumps/s390-lpar-drawer.tar.gz and b/tests/ts/lscpu/dumps/s390-lpar-drawer.tar.gz differ