Adding upstream version 2.39.3.upstream/2.39.3

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 82 insertions, 0 deletions

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
index 0000000..b4dab8e
--- /dev/null
+++ b/tests/ts/lsmem/dumps/s390-zvm-6g.tar.bz2
diff --git a/tests/ts/lsmem/dumps/x86_64-16g.tar.bz2 b/tests/ts/lsmem/dumps/x86_64-16g.tar.bz2
new file mode 100644
index 0000000..ebcf6e7
--- /dev/null
+++ b/tests/ts/lsmem/dumps/x86_64-16g.tar.bz2
diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem
new file mode 100755
index 0000000..7dce0f2
--- /dev/null
+++ b/tests/ts/lsmem/lsmem
@@ -0,0 +1,60 @@
+#!/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"
+ts_check_prog "tar"
+ts_check_prog "bzip2"
+
+LSCOLUMNS="RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE"
+
+
+function do_lsmem {
+	local opts="$*"
+
+	echo -e "\n---\n" >>${TS_OUTPUT}
+	echo "\$ lsmem $opts" >>${TS_OUTPUT}
+	${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+
+}
+
+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
+
+	do_lsmem --split=STATE,REMOVABLE
+	do_lsmem --output RANGE,SIZE --split none
+	do_lsmem --output RANGE,SIZE,STATE --split STATE
+	do_lsmem --all --output $LSCOLUMNS
+	do_lsmem --raw --output $LSCOLUMNS --split $LSCOLUMNS
+	do_lsmem --json --output $LSCOLUMNS --split $LSCOLUMNS
+	do_lsmem -o +ZONES
+	do_lsmem
+
+	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
index 0000000..bbdfff0
--- /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 lsmem(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