From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: heiko.carstens@de.ibm.com Message-Id: <20110906010200.960945606@de.ibm.com> Date: Tue, 06 Sep 2011 02:53:01 +0200 From: Heiko Carstens To: Karel Zak Cc: util-linux@vger.kernel.org, Heiko Carstens Subject: [PATCH 10/11] [PATCH] lscpu: add s390 test case References: <20110906005251.497675140@de.ibm.com> List-ID: Signed-off-by: Heiko Carstens --- tests/expected/lscpu/lscpu-s390-lpar | 35 +++++++++++++++++++++++++++++++++ tests/expected/lscpu/lscpu-s390-zvm | 21 +++++++++++++++++++ tests/ts/lscpu/bla.tar.gz | Bin 0 -> 2573 bytes tests/ts/lscpu/dumps/s390-lpar.tar.gz | Bin 0 -> 6611 bytes tests/ts/lscpu/dumps/s390-zvm.tar.gz | Bin 0 -> 2582 bytes tests/ts/lscpu/mk-input.sh | 4 +++ 6 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 tests/expected/lscpu/lscpu-s390-lpar create mode 100644 tests/expected/lscpu/lscpu-s390-zvm create mode 100644 tests/ts/lscpu/bla.tar.gz create mode 100644 tests/ts/lscpu/dumps/s390-lpar.tar.gz create mode 100644 tests/ts/lscpu/dumps/s390-zvm.tar.gz diff --git a/tests/expected/lscpu/lscpu-s390-lpar b/tests/expected/lscpu/lscpu-s390-lpar new file mode 100644 index 0000000..600fd3f --- /dev/null +++ b/tests/expected/lscpu/lscpu-s390-lpar @@ -0,0 +1,35 @@ +CPU op-mode(s): 32-bit, 64-bit +CPU(s): 20 +On-line CPU(s) list: 1-5,8-19 +Off-line CPU(s) list: 0,6,7 +Thread(s) per core: 1 +Core(s) per socket: 4 +Socket(s) per book: 6 +Book(s): 4 +Vendor ID: IBM/S390 +BogoMIPS: 14367.00 +Hypervisor vendor: IBM +Virtualization type: full +Dispatching mode: vertical + +# The following is the parsable format, which can be fed to other +# programs. Each different item in every column has an unique ID +# starting from zero. +# CPU,Core,Socket,Node +1,0,0, +2,1,0, +3,2,1, +4,3,1, +5,4,1, +8,5,2, +9,6,2, +10,7,2, +11,8,3, +12,9,3, +13,10,3, +14,11,3, +15,12,4, +16,13,5, +17,14,5, +18,15,5, +19,16,6, diff --git a/tests/expected/lscpu/lscpu-s390-zvm b/tests/expected/lscpu/lscpu-s390-zvm new file mode 100644 index 0000000..9ce22d4 --- /dev/null +++ b/tests/expected/lscpu/lscpu-s390-zvm @@ -0,0 +1,21 @@ +CPU op-mode(s): 32-bit, 64-bit +CPU(s): 4 +On-line CPU(s) list: 0-3 +Thread(s) per core: 1 +Core(s) per socket: 1 +Socket(s) per book: 1 +Book(s): 4 +Vendor ID: IBM/S390 +BogoMIPS: 14367.00 +Hypervisor vendor: IBM +Virtualization type: full +Dispatching mode: horizontal + +# The following is the parsable format, which can be fed to other +# programs. Each different item in every column has an unique ID +# starting from zero. +# CPU,Core,Socket,Node +0,0,0, +1,1,1, +2,2,2, +3,3,3, diff --git a/tests/ts/lscpu/bla.tar.gz b/tests/ts/lscpu/bla.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9432cbd5e4cb843477b7e97c173ffbc28a8c24b0 GIT binary patch literal 2573 zcmZ{jdpMMN8^={zsWuyFls98FZweU_L&?;7dn1HxJ1C4&nuo_I)DSB&O3HjNL&4fDMnv?fiOvYw7#h2!>gZkbsG_Dw>Q7^4w z$47X__a*aQE1f)zmOVV9%j6W^8*2+%6;oSn;VP*4Agz2Tk5*EIccyjs-f1t@JMrxm zQ+D0V^$dI69K(p*BKwy%OpX-~+_OfdG@;jpmgM|sW!Sr?0m$Mvy@>QX@3B=QZ?J@? z2EB}gL(0;|A?^0-Kepj8B zePHgy7~WA8`9h#-=847p54k1YF$nHVsv;!i#Bx1 zX@gzW19D|puKO!iX&$3p+j6^4{6F z2wMt*vq!p2BG^Qm9jn`Xml2QD2p9q*4uj9>7K%^5syOCVn6Di&czwoaEE&;d>igso zLEQWcn{p|2yTcB|v{Yo6lvC${yJ_*6t{2znexR(X)kLt?0Lj|iD9mnS{QfrHj1k&g)0(zU!;=d;1NTpsN!FHI^_wSnM+igjtjHmm1?OtS8s5n5NnKbJ zMZvO^tbS8jS4>qwPuhi1t(tM0ttMV}zLU(K*hT1fk}X|vKSimgLerBPzCZQIfFGNj z({pwg>y4$9%1SwV-lp7Y{BZA3)`v;)gr(Mg3a2ua73`lK(N>y;)oq;|(WjRyqb?2; z_GbvX$llw0;kRUgglvDVwN&&YTpDLy6j6trVLe2|4k0V-*(cNAcaowc_i{GLl(QaE z7IOZD##-|fGjjMk>+IvHJQFVhXA5Ty`g{L~hw(Nz6rm%wU0?D0AepkqTfOjH{ldtq zGbwE`tF{&yo%zx8+sApfUd6cqCBSVxUVCO`i(oLc*hQ}{W4KITXvd+GT=Ix{j5tL@ z=q;z3fKBA+osF=K<~&PX_^&r1*6VRP`z`GlzjV#^% z3^p7*R(-zWoQ~P6<=iVRkQT7Yy>Vj0Ho-fJ5ZYwaEx=Y1weL@R%i1NowZA$l0>czh z)q0Le;{>#+_`;Yilz)~;~YGh>b$s#e=Kcaj1RU$%o&9B}fi zhn;{#I{3}!1|Cwv_cz%)HgCMe+vH57k8aw~t8f&4Wc*MP4{7nO?ZJ41*~|L+NThPp zHH@5%k!`!7vn(WmD0K{-(b)g07aGl`Zix?!8bB6#IXG`uRp!KfWVuNBra&}QGt63|k5vfu{a{@>W8?DQl>$BHe?>OK`Y?kn&A2eFMSnpHYhlS8KwBqlM;Ro+g zvh?MlbIBMT!KX#OH{%h1j2h4pJ{-THVO4cojdm zx(OLU>M1`!pIhaudnTBE0)-Qd6+%t=tF@RZah&S(7h*Ye2H`K!!y9o%jw9d)#+v3i zuFb9cQd%sl=PNBrz+g9M;41sc83Vb~aNdCM(N5_gyDf%?7#-7>Q#B_N|D)w+X{>^1 zCsxqtJ6NjF+WZVAhtFZ{$(;~Z4)pnZmH33oG8Sn&v=xE8_zljSt6l!+XC1=Vz^{12c3`S3)_K zralDWof|QoG58uw`;74$l={!?;5{23mQV6ig;0v6$kMxzj50`7-m-d~h>5dTeGFF~ z^@eTf7;$*cQyq+!M7PZ@`E7KIawCVibGkov3~@OD1n<*7&j7BElkPcZb)mH+?% literal 0 HcmV?d00001 diff --git a/tests/ts/lscpu/dumps/s390-lpar.tar.gz b/tests/ts/lscpu/dumps/s390-lpar.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..59aea6ac19669d5030c973745c41de0ef9ff9991 GIT binary patch literal 6611 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 literal 0 HcmV?d00001 diff --git a/tests/ts/lscpu/mk-input.sh b/tests/ts/lscpu/mk-input.sh index ddf70ec..299ac08 100644 --- a/tests/ts/lscpu/mk-input.sh +++ b/tests/ts/lscpu/mk-input.sh @@ -30,6 +30,10 @@ if [ -d "/proc/xen" ]; then fi fi +if [ -e "/proc/sysinfo" ]; then + $CP /proc/sysinfo $TS_DUMP +fi + $CP /sys/devices/system/cpu/* $TS_DUMP $CP /sys/devices/system/node/*/cpumap $TS_DUMP -- 1.7.5.4