From e3d3dada248c5f30e2978840ca1f0a03a4675b53 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 12 Sep 2018 18:19:45 +0900 Subject: [PATCH 1/7] test: install libraries required by tests --- test/test-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index f1646b3bcf..e8706b20a5 100644 --- a/test/test-functions +++ b/test/test-functions @@ -421,7 +421,7 @@ get_ldpath() { install_missing_libraries() { # install possible missing libraries - for i in $initdir{,/usr}/{sbin,bin}/* $initdir{,/usr}/lib/systemd/*; do + for i in $initdir{,/usr}/{sbin,bin}/* $initdir{,/usr}/lib/systemd/{,tests/{,manual/,unsafe/}}*; do LD_LIBRARY_PATH=$(get_ldpath $i) inst_libs $i done } From 7d10ec1cda8fed20c36b16d2387f529583645cda Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 12 Sep 2018 18:20:31 +0900 Subject: [PATCH 2/7] test: introduce install_zoneinfo() But it is not called by default. --- test/test-functions | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/test-functions b/test/test-functions index e8706b20a5..66f60f460f 100644 --- a/test/test-functions +++ b/test/test-functions @@ -632,6 +632,13 @@ install_keymaps() { done } +install_zoneinfo() { + for i in /usr/share/zoneinfo/{,*/,*/*/}*; do + [[ -f $i ]] || continue + inst $i + done +} + install_fonts() { for i in \ /usr/lib/kbd/consolefonts/eurlatgr* \ From 83a7051ee1edbfe8cd2278477d23083beb385409 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Sep 2018 10:54:16 +0900 Subject: [PATCH 3/7] test: add paths of keymaps in install_keymaps() It seems that the paths of directories storing keymaps are changed. --- test/test-functions | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index 66f60f460f..dc3b06e22e 100644 --- a/test/test-functions +++ b/test/test-functions @@ -623,10 +623,14 @@ install_pam() { } install_keymaps() { + # The first three paths may be deprecated. + # It seems now the last two paths are used by many distributions. for i in \ /usr/lib/kbd/keymaps/include/* \ /usr/lib/kbd/keymaps/i386/include/* \ - /usr/lib/kbd/keymaps/i386/qwerty/us.*; do + /usr/lib/kbd/keymaps/i386/qwerty/us.* \ + /usr/lib/kbd/keymaps/legacy/include/* \ + /usr/lib/kbd/keymaps/legacy/i386/qwerty/us.*; do [[ -f $i ]] || continue inst $i done From ad931fee506e1313e8a520ae0ecc1c8e275d9941 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Sep 2018 10:54:28 +0900 Subject: [PATCH 4/7] test: make install_keymaps() optionally install more keymaps --- test/test-functions | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test-functions b/test/test-functions index dc3b06e22e..e3535af839 100644 --- a/test/test-functions +++ b/test/test-functions @@ -634,6 +634,16 @@ install_keymaps() { [[ -f $i ]] || continue inst $i done + + # When it takes any argument, then install more keymaps. + if [[ -n $1 ]]; then + for i in \ + /usr/lib/kbd/keymaps/i386/*/* \ + /usr/lib/kbd/keymaps/legacy/i386/*/*; do + [[ -f $i ]] || continue + inst $i + done + fi } install_zoneinfo() { From dd75c133d81f07c56c82ee4e7a80f391ffebd9ce Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 13 Sep 2018 03:01:42 +0900 Subject: [PATCH 5/7] test: replace duplicated Makefile by symbolic link --- test/TEST-17-UDEV-WANTS/Makefile | 5 +---- test/TEST-18-FAILUREACTION/Makefile | 5 +---- test/TEST-19-DELEGATE/Makefile | 5 +---- test/TEST-20-MAINPIDGAMES/Makefile | 5 +---- test/TEST-21-SYSUSERS/Makefile | 5 +---- test/TEST-22-TMPFILES/Makefile | 5 +---- test/TEST-23-TYPE-EXEC/Makefile | 5 +---- 7 files changed, 7 insertions(+), 28 deletions(-) mode change 100644 => 120000 test/TEST-17-UDEV-WANTS/Makefile mode change 100644 => 120000 test/TEST-18-FAILUREACTION/Makefile mode change 100644 => 120000 test/TEST-19-DELEGATE/Makefile mode change 100644 => 120000 test/TEST-20-MAINPIDGAMES/Makefile mode change 100644 => 120000 test/TEST-21-SYSUSERS/Makefile mode change 100644 => 120000 test/TEST-22-TMPFILES/Makefile mode change 100644 => 120000 test/TEST-23-TYPE-EXEC/Makefile diff --git a/test/TEST-17-UDEV-WANTS/Makefile b/test/TEST-17-UDEV-WANTS/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-17-UDEV-WANTS/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-17-UDEV-WANTS/Makefile b/test/TEST-17-UDEV-WANTS/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-17-UDEV-WANTS/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-18-FAILUREACTION/Makefile b/test/TEST-18-FAILUREACTION/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-18-FAILUREACTION/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-18-FAILUREACTION/Makefile b/test/TEST-18-FAILUREACTION/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-18-FAILUREACTION/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-19-DELEGATE/Makefile b/test/TEST-19-DELEGATE/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-19-DELEGATE/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-19-DELEGATE/Makefile b/test/TEST-19-DELEGATE/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-19-DELEGATE/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-20-MAINPIDGAMES/Makefile b/test/TEST-20-MAINPIDGAMES/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-20-MAINPIDGAMES/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-20-MAINPIDGAMES/Makefile b/test/TEST-20-MAINPIDGAMES/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-20-MAINPIDGAMES/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-21-SYSUSERS/Makefile b/test/TEST-21-SYSUSERS/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-21-SYSUSERS/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-21-SYSUSERS/Makefile b/test/TEST-21-SYSUSERS/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-21-SYSUSERS/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-22-TMPFILES/Makefile b/test/TEST-22-TMPFILES/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-22-TMPFILES/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-22-TMPFILES/Makefile b/test/TEST-22-TMPFILES/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-22-TMPFILES/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-23-TYPE-EXEC/Makefile b/test/TEST-23-TYPE-EXEC/Makefile deleted file mode 100644 index 34d7cc6cdf..0000000000 --- a/test/TEST-23-TYPE-EXEC/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup clean run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ diff --git a/test/TEST-23-TYPE-EXEC/Makefile b/test/TEST-23-TYPE-EXEC/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-23-TYPE-EXEC/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file From 0013fac248a15be3acce84c17a65e3ae0377294b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 14 Sep 2018 13:25:02 +0900 Subject: [PATCH 6/7] test: do not use global variable to pass error --- test/TEST-21-SYSUSERS/test.sh | 1 + test/test-functions | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/TEST-21-SYSUSERS/test.sh b/test/TEST-21-SYSUSERS/test.sh index 73cbe10b69..b1049e720d 100755 --- a/test/TEST-21-SYSUSERS/test.sh +++ b/test/TEST-21-SYSUSERS/test.sh @@ -15,6 +15,7 @@ prepare_testdir() { for i in $1.initial-{passwd,group,shadow}; do test -f $i && cp $i $TESTDIR/etc/${i#*.initial-} done + return 0 } preprocess() { diff --git a/test/test-functions b/test/test-functions index e3535af839..9919728454 100644 --- a/test/test-functions +++ b/test/test-functions @@ -454,7 +454,7 @@ EOF } check_result_nspawn() { - ret=1 + local ret=1 [[ -e $TESTDIR/$1/testok ]] && ret=0 [[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR cp -a $TESTDIR/$1/var/log/journal $TESTDIR @@ -467,7 +467,7 @@ check_result_nspawn() { # can be overridden in specific test check_result_qemu() { - ret=1 + local ret=1 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root [[ -e $TESTDIR/root/testok ]] && ret=0 @@ -1547,7 +1547,9 @@ do_test() { case $1 in --run) echo "TEST RUN: $TEST_DESCRIPTION" - if test_run; then + test_run + ret=$? + if (( $ret == 0 )); then echo "TEST RUN: $TEST_DESCRIPTION [OK]" else echo "TEST RUN: $TEST_DESCRIPTION [FAILED]" From 3f6f58e03a7d22154aabe036439e7f2fb4849570 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Sep 2018 14:30:29 +0900 Subject: [PATCH 7/7] test: add TEST-24-UNIT-TESTS running all basic tests under containers --- test/TEST-24-UNIT-TESTS/Makefile | 1 + test/TEST-24-UNIT-TESTS/test.sh | 106 +++++++++++++++++++++++++++ test/TEST-24-UNIT-TESTS/testsuite.sh | 34 +++++++++ 3 files changed, 141 insertions(+) create mode 120000 test/TEST-24-UNIT-TESTS/Makefile create mode 100755 test/TEST-24-UNIT-TESTS/test.sh create mode 100755 test/TEST-24-UNIT-TESTS/testsuite.sh diff --git a/test/TEST-24-UNIT-TESTS/Makefile b/test/TEST-24-UNIT-TESTS/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-24-UNIT-TESTS/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-24-UNIT-TESTS/test.sh new file mode 100755 index 0000000000..014ee52277 --- /dev/null +++ b/test/TEST-24-UNIT-TESTS/test.sh @@ -0,0 +1,106 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh +set -e +TEST_DESCRIPTION="Run unit tests under containers" +RUN_IN_UNPRIVILEGED_CONTAINER=yes + +. $TEST_BASE_DIR/test-functions + +check_result_nspawn() { + local _ret=1 + [[ -e $TESTDIR/$1/testok ]] && _ret=0 + if [[ -s $TESTDIR/$1/failed ]]; then + _ret=$(($_ret+1)) + echo "=== Failed test log ===" + cat $TESTDIR/$1/failed + else + if [[ -s $TESTDIR/$1/skipped ]]; then + echo "=== Skipped test log ==" + cat $TESTDIR/$1/skipped + fi + if [[ -s $TESTDIR/$1/testok ]]; then + echo "=== Passed tests ===" + cat $TESTDIR/$1/testok + fi + fi + cp -a $TESTDIR/$1/var/log/journal $TESTDIR + [[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1)) + return $_ret +} + +check_result_qemu() { + local _ret=1 + mkdir -p $TESTDIR/root + mount ${LOOPDEV}p1 $TESTDIR/root + [[ -e $TESTDIR/root/testok ]] && _ret=0 + if [[ -s $TESTDIR/root/failed ]]; then + _ret=$(($_ret+1)) + echo "=== Failed test log ===" + cat $TESTDIR/root/failed + else + if [[ -s $TESTDIR/root/skipped ]]; then + echo "=== Skipped test log ==" + cat $TESTDIR/root/skipped + fi + if [[ -s $TESTDIR/root/testok ]]; then + echo "=== Passed tests ===" + cat $TESTDIR/root/testok + fi + fi + cp -a $TESTDIR/root/var/log/journal $TESTDIR + umount $TESTDIR/root + [[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1)) + return $_ret +} + +test_setup() { + if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then + dfatal "Needs to be built with -Dinstall-tests=true" + exit 1 + fi + + create_empty_image + mkdir -p $TESTDIR/root + mount ${LOOPDEV}p1 $TESTDIR/root + + # Create what will eventually be our root filesystem onto an overlay + ( + LOG_LEVEL=5 + eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) + + for i in getfacl dirname basename capsh cut rev stat mktemp rmdir ionice unshare uname tr awk getent diff xzcat lz4cat; do + inst_binary $i + done + + inst /etc/hosts + + setup_basic_environment + install_keymaps yes + install_zoneinfo + + # setup the testsuite service + cat >$initdir/etc/systemd/system/testsuite.service < /$NAME.log 2>&1 + ret=$? + if (( $ret && $ret != 77 )); then + echo "$NAME failed with $ret" + echo $NAME >> /failed-tests + echo "--- $NAME begin ---" >> /failed + cat /$NAME.log >> /failed + echo "--- $NAME end ---" >> /failed + elif (( $ret == 77 )); then + echo "$NAME skipped" + echo $NAME >> /skipped-tests + echo "--- $NAME begin ---" >> /skipped + cat /$NAME.log >> /skipped + echo "--- $NAME end ---" >> /skipped + else + echo "$NAME OK" + echo $NAME >> /testok + fi + + systemd-cat echo "--- $NAME ---" + systemd-cat cat /$NAME.log +done + +exit 0