lsmem: add testcase

Add a single s390 specific test case to verify that the contents of
various output formats do not change in incompatible way if the
lsmem code is changed.

This is based on a patch from Clemens von Mann.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/tests/commands.sh b/tests/commands.sh
index ac4a490cf80d561701c9f3d68609431472742318..2e3a276472c2e5b2d9532f896d674369943518d0 100644 (file)
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -68,6 +68,7 @@ TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/look"}
 TS_CMD_LOSETUP=${TS_CMD_LOSETUP:-"$top_builddir/losetup"}
 TS_CMD_LSBLK=${TS_CMD_LSBLK-"$top_builddir/lsblk"}
 TS_CMD_LSCPU=${TS_CMD_LSCPU-"$top_builddir/lscpu"}
+TS_CMD_LSMEM=${TS_CMD_LSMEM-"$top_builddir/lsmem"}
 TS_CMD_MCOOKIE=${TS_CMD_MCOOKIE-"$top_builddir/mcookie"}
 TS_CMD_MKCRAMFS=${TS_CMD_MKCRAMFS:-"$top_builddir/mkfs.cramfs"}
 TS_CMD_MKMINIX=${TS_CMD_MKMINIX:-"$top_builddir/mkfs.minix"}

diff --git a/tests/expected/lsmem/lsmem-s390-zvm-6g b/tests/expected/lsmem/lsmem-s390-zvm-6g
new file mode 100644 (file)
index 0000000..be244ad
--- /dev/null
+++ b/tests/expected/lsmem/lsmem-s390-zvm-6g
@@ -0,0 +1,91 @@
+>lsmem
+RANGE                                 SIZE STATE   REMOVABLE BLOCK
+0x0000000000000000-0x000000006fffffff 1.8G online  yes       0-6
+0x0000000070000000-0x000000007fffffff 256M online  no        7
+0x0000000080000000-0x000000009fffffff 512M online  yes       8-9
+0x00000000a0000000-0x00000000bfffffff 512M online  no        10-11
+0x00000000c0000000-0x00000000dfffffff 512M online  yes       12-13
+0x00000000e0000000-0x00000000efffffff 256M offline -         14
+0x00000000f0000000-0x00000000ffffffff 256M online  yes       15
+0x0000000100000000-0x000000011fffffff 512M online  no        16-17
+0x0000000120000000-0x000000013fffffff 512M online  yes       18-19
+0x0000000140000000-0x000000017fffffff   1G offline -         20-23
+
+Memory block size   :     256M
+Total online memory :     4.8G
+Total offline memory:     1.3G
+
+>lsmem -a
+RANGE                                 SIZE STATE   REMOVABLE BLOCK
+0x0000000000000000-0x000000000fffffff 256M online  yes       0
+0x0000000010000000-0x000000001fffffff 256M online  yes       1
+0x0000000020000000-0x000000002fffffff 256M online  yes       2
+0x0000000030000000-0x000000003fffffff 256M online  yes       3
+0x0000000040000000-0x000000004fffffff 256M online  yes       4
+0x0000000050000000-0x000000005fffffff 256M online  yes       5
+0x0000000060000000-0x000000006fffffff 256M online  yes       6
+0x0000000070000000-0x000000007fffffff 256M online  no        7
+0x0000000080000000-0x000000008fffffff 256M online  yes       8
+0x0000000090000000-0x000000009fffffff 256M online  yes       9
+0x00000000a0000000-0x00000000afffffff 256M online  no        10
+0x00000000b0000000-0x00000000bfffffff 256M online  no        11
+0x00000000c0000000-0x00000000cfffffff 256M online  yes       12
+0x00000000d0000000-0x00000000dfffffff 256M online  yes       13
+0x00000000e0000000-0x00000000efffffff 256M offline -         14
+0x00000000f0000000-0x00000000ffffffff 256M online  yes       15
+0x0000000100000000-0x000000010fffffff 256M online  no        16
+0x0000000110000000-0x000000011fffffff 256M online  no        17
+0x0000000120000000-0x000000012fffffff 256M online  yes       18
+0x0000000130000000-0x000000013fffffff 256M online  yes       19
+0x0000000140000000-0x000000014fffffff 256M offline -         20
+0x0000000150000000-0x000000015fffffff 256M offline -         21
+0x0000000160000000-0x000000016fffffff 256M offline -         22
+0x0000000170000000-0x000000017fffffff 256M offline -         23
+
+Memory block size   :     256M
+Total online memory :     4.8G
+Total offline memory:     1.3G
+
+>lsmem -e
+RANGE                                 SIZE STATE   REMOVABLE BLOCK NODE
+0x0000000000000000-0x000000006fffffff 1.8G online  yes       0-6   0
+0x0000000070000000-0x000000007fffffff 256M online  no        7     0
+0x0000000080000000-0x000000009fffffff 512M online  yes       8-9   0
+0x00000000a0000000-0x00000000bfffffff 512M online  no        10-11 0
+0x00000000c0000000-0x00000000dfffffff 512M online  yes       12-13 0
+0x00000000e0000000-0x00000000efffffff 256M offline -         14    0
+0x00000000f0000000-0x00000000ffffffff 256M online  yes       15    0
+0x0000000100000000-0x000000011fffffff 512M online  no        16-17 0
+0x0000000120000000-0x000000013fffffff 512M online  yes       18-19 0
+0x0000000140000000-0x000000017fffffff   1G offline -         20-23 0
+
+Memory block size   :     256M
+Total online memory :     4.8G
+Total offline memory:     1.3G
+
+>lsmem -p -a
+# RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+0x0000000000000000-0x000000000fffffff,268435456,online,yes,0,0
+0x0000000010000000-0x000000001fffffff,268435456,online,yes,1,0
+0x0000000020000000-0x000000002fffffff,268435456,online,yes,2,0
+0x0000000030000000-0x000000003fffffff,268435456,online,yes,3,0
+0x0000000040000000-0x000000004fffffff,268435456,online,yes,4,0
+0x0000000050000000-0x000000005fffffff,268435456,online,yes,5,0
+0x0000000060000000-0x000000006fffffff,268435456,online,yes,6,0
+0x0000000070000000-0x000000007fffffff,268435456,online,no,7,0
+0x0000000080000000-0x000000008fffffff,268435456,online,yes,8,0
+0x0000000090000000-0x000000009fffffff,268435456,online,yes,9,0
+0x00000000a0000000-0x00000000afffffff,268435456,online,no,10,0
+0x00000000b0000000-0x00000000bfffffff,268435456,online,no,11,0
+0x00000000c0000000-0x00000000cfffffff,268435456,online,yes,12,0
+0x00000000d0000000-0x00000000dfffffff,268435456,online,yes,13,0
+0x00000000e0000000-0x00000000efffffff,268435456,offline,-,14,0
+0x00000000f0000000-0x00000000ffffffff,268435456,online,yes,15,0
+0x0000000100000000-0x000000010fffffff,268435456,online,no,16,0
+0x0000000110000000-0x000000011fffffff,268435456,online,no,17,0
+0x0000000120000000-0x000000012fffffff,268435456,online,yes,18,0
+0x0000000130000000-0x000000013fffffff,268435456,online,yes,19,0
+0x0000000140000000-0x000000014fffffff,268435456,offline,-,20,0
+0x0000000150000000-0x000000015fffffff,268435456,offline,-,21,0
+0x0000000160000000-0x000000016fffffff,268435456,offline,-,22,0
+0x0000000170000000-0x000000017fffffff,268435456,offline,-,23,0

diff --git a/tests/ts/lsmem/dumps/s390-zvm-6g.tar.bz2 b/tests/ts/lsmem/dumps/s390-zvm-6g.tar.bz2
new file mode 100644 (file)
index 0000000..b4dab8e
Binary files /dev/null and b/tests/ts/lsmem/dumps/s390-zvm-6g.tar.bz2 differ

diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem
new file mode 100755 (executable)
index 0000000..7e6e2f9
--- /dev/null
+++ b/tests/ts/lsmem/lsmem
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+TS_TOPDIR="${0%/*}/../.."
+. $TS_TOPDIR/functions.sh
+
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_LSMEM"
+
+for dump in $(ls $TS_SELF/dumps/*.tar.bz2 | sort); do
+       name=$(basename $dump .tar.bz2)
+       dumpdir="$TS_OUTDIR/dumps"
+
+       ts_init_subtest $name
+       mkdir -p $dumpdir
+
+       tar -C $dumpdir -jxf $dump
+
+       echo ">lsmem" >>"${TS_OUTPUT}"
+       "${TS_CMD_LSMEM}" -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1
+
+       echo >>"${TS_OUTPUT}"
+       echo ">lsmem -a" >>"${TS_OUTPUT}"
+       "${TS_CMD_LSMEM}" -a -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1
+
+       echo >>"${TS_OUTPUT}"
+       echo ">lsmem -e" >>"${TS_OUTPUT}"
+       "${TS_CMD_LSMEM}" -e -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1
+
+       echo >>"${TS_OUTPUT}"
+       echo ">lsmem -p -a" >>"${TS_OUTPUT}"
+       "${TS_CMD_LSMEM}" -p -a -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1
+
+       ts_finalize_subtest
+done
+
+ts_finalize

diff --git a/tests/ts/lsmem/mk-input.sh b/tests/ts/lsmem/mk-input.sh
new file mode 100755 (executable)
index 0000000..e9a4e72
--- /dev/null
+++ b/tests/ts/lsmem/mk-input.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This script makes a copy of relevant files from /sys.
+# The files are useful for lscpu(1) regression tests.
+#
+progname=$(basename $0)
+
+if [ -z "$1" ]; then
+       echo -e "\nusage: $progname <testname>\n"
+       exit 1
+fi
+
+TS_NAME="$1"
+TS_DUMP="$TS_NAME"
+CP="cp -r --parent"
+
+mkdir -p $TS_DUMP/sys/devices/system
+
+$CP /sys/devices/system/memory $TS_DUMP
+
+tar jcvf $TS_NAME.tar.bz2 $TS_DUMP
+rm -rf $TS_DUMP