This patch introduces four new functions to execute a test script with a
UML kernel.
_run_user_mode <UML binary> <init> <additional kernel parameters>
It executes the UML kernel passed as first argument, with the init program
specified as second argument. Additional kernel parameters can be passed
through the third argument.
This function is used to re-execute the script calling this function, so
that the tests will be executed in the new environment rather than in the
launching environment. This behavior is similar to doing a fork() in C.
_exit_user_mode <UML binary>
This function terminates the process that launched the UML kernel, so that
the following commands in the script are executed by the UML kernel.
_init_user_mode
This function performs some initialization tasks, such as mounting sysfs,
securityfs and procfs, and launching haveged to initialize the random
device in the UML kernel.
_cleanup_user_mode
This function cleans the environment by unmounting the filesystems mounted
by _init_user_mode.
A typical structure of a test script to be launched by the UML kernel is:
--
trap cleanup EXIT
cleanup() {
< cleanup commands >
_cleanup_user_mode
_report_exit
}
< commands before launching the UML kernel >
_run_user_mode <UML binary> <init> <additional kernel parameters>
_exit_user_mode <UML binary>
_init_user_mode
< tests executed by the UML kernel >
--
Finally, this patch adds haveged as software dependency.
Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxxx>
---
ci/alpine.sh | 3 ++-
ci/debian.sh | 3 ++-
ci/fedora.sh | 10 ++++++++-
ci/tumbleweed.sh | 3 ++-
tests/functions.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/ci/alpine.sh b/ci/alpine.sh
index 588f450bdb5f..a6db9271b28f 100755
--- a/ci/alpine.sh
+++ b/ci/alpine.sh
@@ -43,7 +43,8 @@ apk add \
wget \
which \
xxd \
- curl
+ curl \
+ haveged
if [ ! "$TSS" ]; then
apk add git
diff --git a/ci/debian.sh b/ci/debian.sh
index 07ef28c3a2f0..13127b16d2d8 100755
--- a/ci/debian.sh
+++ b/ci/debian.sh
@@ -50,7 +50,8 @@ $apt \
wget \
xsltproc \
curl \
- ca-certificates
+ ca-certificates \
+ haveged
$apt xxd || $apt vim-common
$apt libengine-gost-openssl1.1$ARCH || true
diff --git a/ci/fedora.sh b/ci/fedora.sh
index f07c678130ae..5808e65fde3a 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -17,6 +17,13 @@ esac
# ibmswtpm2 requires gcc
[ "$CC" = "gcc" ] || CC="gcc $CC"
+. /etc/os-release
+
+# EPEL required for haveged
+if [ "$PRETTY_NAME" = "CentOS Linux 8" ]; then
+ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+fi
+
yum -y install \
$CC $TSS \
asciidoc \
@@ -39,7 +46,8 @@ yum -y install \
vim-common \
wget \
which \
- curl
+ curl \
+ haveged
yum -y install docbook5-style-xsl || true
yum -y install swtpm || true
diff --git a/ci/tumbleweed.sh b/ci/tumbleweed.sh
index b6a42df7bfca..f12c41c43e1a 100755
--- a/ci/tumbleweed.sh
+++ b/ci/tumbleweed.sh
@@ -41,7 +41,8 @@ zypper --non-interactive install --force-resolution --no-recommends \
wget \
which \
xsltproc \
- curl
+ curl \
+ haveged
if [ -f /usr/lib/ibmtss/tpm_server -a ! -e /usr/local/bin/tpm_server ]; then
ln -s /usr/lib/ibmtss/tpm_server /usr/local/bin
diff --git a/tests/functions.sh b/tests/functions.sh
index 91cd5d96ddc4..5893e6dc4931 100755
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -272,3 +272,54 @@ _report_exit() {
fi
}
+# Syntax: _run_user_mode <UML binary> <init> <additional kernel parameters>
+_run_user_mode() {
+ if [ ! -f "$1" ]; then
+ return
+ fi
+
+ if [ $$ -eq 1 ]; then
+ return
+ fi
+
+ expect_pass $1 rootfstype=hostfs rw init=$2 quiet mem=256M $3
+}
+
+# Syntax: _exit_user_mode <UML binary>
+_exit_user_mode() {
+ if [ $$ -eq 1 ]; then
+ return
+ fi
+
+ if [ -f "$1" ]; then
+ exit $OK
+ fi
+}
+
+# Syntax: _init_user_mode
+_init_user_mode() {
+ if [ $$ -ne 1 ]; then
+ return
+ fi
+
+ mount -t proc proc /proc
+ mount -t sysfs sysfs /sys
+ mount -t securityfs securityfs /sys/kernel/security
+
+ if [ -n "$(which haveged 2> /dev/null)" ]; then
+ $(which haveged) -w 1024 &> /dev/null
+ fi
+
+ pushd $PWD > /dev/null
+}
+
+# Syntax: _cleanup_user_mode
+_cleanup_user_mode() {
+ if [ $$ -ne 1 ]; then
+ return
+ fi
+
+ umount /sys/kernel/security
+ umount /sys
+ umount /proc
+}
--
2.25.1
