diff options
Diffstat (limited to 'test/TEST-01-BASIC/test.sh')
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index eb6a80a07c..e41ed9dcfe 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -3,8 +3,7 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh TEST_DESCRIPTION="Basic systemd setup" -KVERSION=${KVERSION-$(uname -r)} -KERNEL_VER=$(uname -r) +. $TEST_BASE_DIR/test-functions # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" @@ -33,7 +32,7 @@ run_qemu() { run_nspawn() { - systemd-nspawn -b -D $TESTDIR/nspawn-root --capability=CAP_AUDIT_CONTROL,CAP_AUDIT_WRITE /usr/lib/systemd/systemd + ../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd ret=1 [[ -e $TESTDIR/nspawn-root/testok ]] && ret=0 cp -a $TESTDIR/nspawn-root/failed $TESTDIR @@ -123,15 +122,8 @@ EOF LABEL=systemd / ext3 rw 0 1 EOF - # setup the testsuite target - cat >$initdir/etc/systemd/system/testsuite.target <<EOF -[Unit] -Description=Testsuite target -Requires=multi-user.target -After=multi-user.target -Conflicts=rescue.target -AllowIsolate=yes -EOF + # setup the testsuite target and the test ending service + cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/ # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF @@ -141,11 +133,12 @@ After=multi-user.target [Service] ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;' -ExecStopPost=/usr/bin/systemctl poweroff Type=oneshot EOF + mkdir -p $initdir/etc/systemd/system/testsuite.target.wants ln -fs ../testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service + ln -fs ../end.service $initdir/etc/systemd/system/testsuite.target.wants/end.service # make the testsuite the default target ln -fs testsuite.target $initdir/etc/systemd/system/default.target @@ -219,7 +212,7 @@ EOF # install ld.so.conf* and run ldconfig cp -a /etc/ld.so.conf* $initdir/etc ldconfig -r "$initdir" - ddebug "Strip binaeries" + ddebug "Strip binaries" find "$initdir" -perm +111 -type f | xargs strip --strip-unneeded | ddebug # copy depmod files @@ -236,7 +229,7 @@ EOF ddebug "cp -ar $TESTDIR/root $TESTDIR/nspawn-root" cp -ar $TESTDIR/root $TESTDIR/nspawn-root # we don't mount in the nspawn root - rm -fr $TESTDIR/nspawn-root/etc/fstab + rm -f $TESTDIR/nspawn-root/etc/fstab ddebug "umount $TESTDIR/root" umount $TESTDIR/root @@ -248,5 +241,4 @@ test_cleanup() { return 0 } -. $TEST_BASE_DIR/test-functions do_test "$@" |