diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 190 | ||||
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 192 | ||||
| -rwxr-xr-x | test/TEST-03-JOBS/test.sh | 184 | ||||
| -rw-r--r-- | test/test-functions | 254 |
5 files changed, 294 insertions, 528 deletions
@@ -223,7 +223,7 @@ Features: * test/: - add 'set -e' to scripts in test/ - make stuff in test/ work with separate output dir - - remove all the duplicated code in test/ + - qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html * systemctl delete x.snapshot leaves no trace in logs (at least at default level). diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 9b55a27a20..aaf63f4f52 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -7,51 +7,31 @@ TEST_DESCRIPTION="Basic systemd setup" # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" -DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort" - -run_qemu() { - # TODO: qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html - qemu-kvm \ - -hda $TESTDIR/rootdisk.img \ - -m 512M -nographic \ - -net none -kernel /boot/vmlinuz-$KERNEL_VER \ - -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd ro console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" || return 1 +check_result_qemu() { ret=1 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root [[ -e $TESTDIR/root/testok ]] && ret=0 - cp -a $TESTDIR/root/failed $TESTDIR - cp -a $TESTDIR/root/var/log/journal $TESTDIR + [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR + [[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR umount $TESTDIR/root - cat $TESTDIR/failed + [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal test -s $TESTDIR/failed && ret=$(($ret+1)) return $ret } - -run_nspawn() { - ../../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 - cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR - cat $TESTDIR/failed - ls -l $TESTDIR/journal/*/*.journal - test -s $TESTDIR/failed && ret=$(($ret+1)) - return $ret -} - - test_run() { if check_qemu ; then - run_qemu || return 1 + run_qemu + check_result_qemu || return 1 else dwarn "can't run qemu-kvm, skipping" fi if check_nspawn; then - run_nspawn || return 1 + run_nspawn + check_result_nspawn || return 1 else dwarn "can't run systemd-nspawn, skipping" fi @@ -59,71 +39,16 @@ test_run() { } test_setup() { - rm -f $TESTDIR/rootdisk.img - # Create the blank file to use as a root filesystem - dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=200 - LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img) - [ -b $LOOPDEV ] || return 1 - echo "LOOPDEV=$LOOPDEV" >> $STATEFILE - sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF -,3200 -, -EOF - - mkfs.ext3 -L systemd ${LOOPDEV}p1 - echo -n test >$TESTDIR/keyfile + create_empty_image mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root - mkdir -p $TESTDIR/root/run # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - initdir=$TESTDIR/root - - # create the basic filesystem layout - setup_basic_dirs - - # install compiled files - (cd ../..; make DESTDIR=$initdir install) - - # remove unneeded documentation - rm -fr $initdir/usr/share/{man,doc,gtk-doc} - - # install possible missing libraries - for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do - inst_libs $i - done - - # make a journal directory - mkdir -p $initdir/var/log/journal - - # install some basic config files - inst /etc/sysconfig/init - inst /etc/passwd - inst /etc/shadow - inst /etc/group - inst /etc/shells - inst /etc/nsswitch.conf - inst /etc/pam.conf - inst /etc/securetty - inst /etc/os-release - inst /etc/localtime - # we want an empty environment - > $initdir/etc/environment - > $initdir/etc/machine-id - - # set the hostname - echo systemd-testsuite > $initdir/etc/hostname - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - cat >$initdir/etc/fstab <<EOF -LABEL=systemd / ext3 rw 0 1 -EOF - - # setup the testsuite target and the test ending service - cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/ + setup_basic_environment # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF @@ -136,100 +61,9 @@ ExecStart=/bin/bash -c 'set -x; ( systemctl --failed --no-legend --no-pager; sys 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 - mkdir -p $initdir/etc/rc.d - cat >$initdir/etc/rc.d/rc.local <<EOF -#!/bin/bash -exit 0 -EOF - chmod 0755 $initdir/etc/rc.d/rc.local - # install basic tools needed - dracut_install sh bash setsid loadkeys setfont \ - login sushell sulogin gzip sleep echo mount umount cryptsetup - dracut_install dmsetup modprobe - - # install libnss_files for login - inst_libdir_file "libnss_files*" - - # install dbus and pam - find \ - /etc/dbus-1 \ - /etc/pam.d \ - /etc/security \ - /lib64/security \ - /lib/security -xtype f \ - | while read file; do - inst $file - done - - # install dbus socket and service file - inst /usr/lib/systemd/system/dbus.socket - inst /usr/lib/systemd/system/dbus.service - - # install basic keyboard maps and fonts - for i in \ - /usr/lib/kbd/consolefonts/latarcyrheb-sun16* \ - /usr/lib/kbd/keymaps/include/* \ - /usr/lib/kbd/keymaps/i386/include/* \ - /usr/lib/kbd/keymaps/i386/qwerty/us.*; do - [[ -f $i ]] || continue - inst $i - done - - # some basic terminfo files - for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - - # softlink mtab - ln -fs /proc/self/mounts $initdir/etc/mtab - - # install any Execs from the service files - egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \ - | while read i; do - i=${i##Exec*=}; i=${i##-} - inst $i - done - - # install plymouth, if found... else remove plymouth service files - # if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then - # PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ - # /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir - # dracut_install plymouth plymouthd - # else - rm -f $initdir/{usr/lib,etc}/systemd/system/plymouth* $initdir/{usr/lib,etc}/systemd/system/*/plymouth* - # fi - - # some helper tools for debugging - [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS - - # install ld.so.conf* and run ldconfig - cp -a /etc/ld.so.conf* $initdir/etc - ldconfig -r "$initdir" - ddebug "Strip binaries" - find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug - - # copy depmod files - inst /lib/modules/$KERNEL_VER/modules.order - inst /lib/modules/$KERNEL_VER/modules.builtin - # generate module dependencies - if [[ -d $initdir/lib/modules/$KERNEL_VER ]] && \ - ! depmod -a -b "$initdir" $KERNEL_VER; then - dfatal "\"depmod -a $KERNEL_VER\" failed." - exit 1 - fi + setup_testsuite ) - rm -fr $TESTDIR/nspawn-root - ddebug "cp -ar $TESTDIR/root $TESTDIR/nspawn-root" - cp -ar $TESTDIR/root $TESTDIR/nspawn-root - # we don't mount in the nspawn root - rm -f $TESTDIR/nspawn-root/etc/fstab + setup_nspawn_root ddebug "umount $TESTDIR/root" umount $TESTDIR/root diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index b98d23810a..86617dfc7b 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -7,28 +7,20 @@ TEST_DESCRIPTION="cryptsetup systemd setup" # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" -DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort" - -run_qemu() { - # TODO: qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html - qemu-kvm \ - -hda $TESTDIR/rootdisk.img \ - -m 512M -nographic \ - -net none -kernel /boot/vmlinuz-$KERNEL_VER \ - -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd ro console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" || return 1 +check_result_qemu() { ret=1 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root [[ -e $TESTDIR/root/testok ]] && ret=0 - cp -a $TESTDIR/root/failed $TESTDIR + [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile mount /dev/mapper/varcrypt $TESTDIR/root/var - cp -a $TESTDIR/root/var/log/journal $TESTDIR + [[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR umount $TESTDIR/root/var umount $TESTDIR/root cryptsetup luksClose /dev/mapper/varcrypt - cat $TESTDIR/failed + [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal test -s $TESTDIR/failed && ret=$(($ret+1)) return $ret @@ -37,7 +29,8 @@ run_qemu() { test_run() { if check_qemu ; then - run_qemu || return 1 + run_qemu + check_result_qemu || return 1 else dwarn "can't run qemu-kvm, skipping" fi @@ -45,84 +38,23 @@ test_run() { } test_setup() { - rm -f $TESTDIR/rootdisk.img - # Create the blank file to use as a root filesystem - dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=200 - LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img) - [ -b $LOOPDEV ] || return 1 - echo "LOOPDEV=$LOOPDEV" >> $STATEFILE - sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF -,3200 -, -EOF - - mkfs.ext3 -L systemd ${LOOPDEV}p1 + create_empty_image echo -n test >$TESTDIR/keyfile cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile mkfs.ext3 -L var /dev/mapper/varcrypt mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root - mkdir -p $TESTDIR/root/run mkdir -p $TESTDIR/root/var mount /dev/mapper/varcrypt $TESTDIR/root/var # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - initdir=$TESTDIR/root - - # create the basic filesystem layout - setup_basic_dirs - - # install compiled files - (cd ../..; make DESTDIR=$initdir install) - - # remove unneeded documentation - rm -fr $initdir/usr/share/{man,doc,gtk-doc} - - # install possible missing libraries - for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do - inst_libs $i - done - - # make a journal directory - mkdir -p $initdir/var/log/journal - - # install some basic config files - inst /etc/sysconfig/init - inst /etc/passwd - inst /etc/shadow - inst /etc/group - inst /etc/shells - inst /etc/nsswitch.conf - inst /etc/pam.conf - inst /etc/securetty - inst /etc/os-release - inst /etc/localtime - # we want an empty environment - > $initdir/etc/environment - > $initdir/etc/machine-id - - # set the hostname - echo systemd-testsuite > $initdir/etc/hostname - eval $(udevadm info --export --query=env --name=/dev/mapper/varcrypt) eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - cat >$initdir/etc/crypttab <<EOF -$DM_NAME UUID=$ID_FS_UUID /etc/varkey -EOF - echo -n test > $initdir/etc/varkey - cat $initdir/etc/crypttab | ddebug - - cat >$initdir/etc/fstab <<EOF -LABEL=systemd / ext3 rw 0 1 -/dev/mapper/varcrypt /var ext3 defaults 0 1 -EOF - - # setup the testsuite target and the test ending service - cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/ + setup_basic_environment # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF @@ -135,108 +67,20 @@ ExecStart=/bin/bash -c 'set -x; ( systemctl --failed --no-legend --no-pager; sys 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 + setup_testsuite - # make the testsuite the default target - ln -fs testsuite.target $initdir/etc/systemd/system/default.target - mkdir -p $initdir/etc/rc.d - cat >$initdir/etc/rc.d/rc.local <<EOF -#!/bin/bash -exit 0 + install_dmevent + cat >$initdir/etc/crypttab <<EOF +$DM_NAME UUID=$ID_FS_UUID /etc/varkey EOF - chmod 0755 $initdir/etc/rc.d/rc.local - # install basic tools needed - dracut_install sh bash setsid loadkeys setfont \ - login sushell sulogin gzip sleep echo mount umount cryptsetup - dracut_install dmsetup modprobe - - instmods dm_crypt =crypto - - type -P dmeventd >/dev/null && dracut_install dmeventd - - inst_libdir_file "libdevmapper-event.so*" - - inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules - - # install libnss_files for login - inst_libdir_file "libnss_files*" - - # install dbus and pam - find \ - /etc/dbus-1 \ - /etc/pam.d \ - /etc/security \ - /lib64/security \ - /lib/security -xtype f \ - | while read file; do - inst $file - done - - # install dbus socket and service file - inst /usr/lib/systemd/system/dbus.socket - inst /usr/lib/systemd/system/dbus.service - - # install basic keyboard maps and fonts - for i in \ - /usr/lib/kbd/consolefonts/latarcyrheb-sun16* \ - /usr/lib/kbd/keymaps/include/* \ - /usr/lib/kbd/keymaps/i386/include/* \ - /usr/lib/kbd/keymaps/i386/qwerty/us.*; do - [[ -f $i ]] || continue - inst $i - done - - # some basic terminfo files - for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - - # softlink mtab - ln -fs /proc/self/mounts $initdir/etc/mtab - - # install any Execs from the service files - egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \ - | while read i; do - i=${i##Exec*=}; i=${i##-} - inst $i - done - - # install plymouth, if found... else remove plymouth service files - # if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then - # PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ - # /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir - # dracut_install plymouth plymouthd - # else - rm -f $initdir/{usr/lib,etc}/systemd/system/plymouth* $initdir/{usr/lib,etc}/systemd/system/*/plymouth* - # fi - - # some helper tools for debugging - [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS - - # install ld.so.conf* and run ldconfig - cp -a /etc/ld.so.conf* $initdir/etc - ldconfig -r "$initdir" - ddebug "Strip binaeries" - find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug + echo -n test > $initdir/etc/varkey + cat $initdir/etc/crypttab | ddebug - # copy depmod files - inst /lib/modules/$KERNEL_VER/modules.order - inst /lib/modules/$KERNEL_VER/modules.builtin - # generate module dependencies - if [[ -d $initdir/lib/modules/$KERNEL_VER ]] && \ - ! depmod -a -b "$initdir" $KERNEL_VER; then - dfatal "\"depmod -a $KERNEL_VER\" failed." - exit 1 - fi + cat >>$initdir/etc/fstab <<EOF +/dev/mapper/varcrypt /var ext3 defaults 0 1 +EOF ) - rm -fr $TESTDIR/nspawn-root - 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 + setup_nspawn_root ddebug "umount $TESTDIR/root/var" umount $TESTDIR/root/var diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh index 02fd8b9ce8..630325867b 100755 --- a/test/TEST-03-JOBS/test.sh +++ b/test/TEST-03-JOBS/test.sh @@ -7,16 +7,8 @@ TEST_DESCRIPTION="Job-related tests" # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" -DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort" - -run_qemu() { - # TODO: qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html - qemu-kvm \ - -hda $TESTDIR/rootdisk.img \ - -m 512M -nographic \ - -net none -kernel /boot/vmlinuz-$KERNEL_VER \ - -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd ro console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" || return 1 +check_result_qemu() { ret=1 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root @@ -30,28 +22,16 @@ run_qemu() { return $ret } - -run_nspawn() { - ../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd - ret=1 - [[ -e $TESTDIR/nspawn-root/testok ]] && ret=0 - [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/nspawn-root/failed $TESTDIR - cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR - [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed - ls -l $TESTDIR/journal/*/*.journal - test -s $TESTDIR/failed && ret=$(($ret+1)) - return $ret -} - - test_run() { if check_qemu ; then - run_qemu || return 1 + run_qemu + check_result_qemu || return 1 else dwarn "can't run qemu-kvm, skipping" fi if check_nspawn; then - run_nspawn || return 1 + run_nspawn + check_result_nspawn || return 1 else dwarn "can't run systemd-nspawn, skipping" fi @@ -59,71 +39,16 @@ test_run() { } test_setup() { - rm -f $TESTDIR/rootdisk.img - # Create the blank file to use as a root filesystem - dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=200 - LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img) - [ -b $LOOPDEV ] || return 1 - echo "LOOPDEV=$LOOPDEV" >> $STATEFILE - sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF -,3200 -, -EOF - - mkfs.ext3 -L systemd ${LOOPDEV}p1 - echo -n test >$TESTDIR/keyfile + create_empty_image mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root - mkdir -p $TESTDIR/root/run # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - initdir=$TESTDIR/root - - # create the basic filesystem layout - setup_basic_dirs - - # install compiled files - (cd ../..; make DESTDIR=$initdir install) - - # remove unneeded documentation - rm -fr $initdir/usr/share/{man,doc,gtk-doc} - - # install possible missing libraries - for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do - inst_libs $i - done - - # make a journal directory - mkdir -p $initdir/var/log/journal - - # install some basic config files - inst /etc/sysconfig/init - inst /etc/passwd - inst /etc/shadow - inst /etc/group - inst /etc/shells - inst /etc/nsswitch.conf - inst /etc/pam.conf - inst /etc/securetty - inst /etc/os-release - inst /etc/localtime - # we want an empty environment - > $initdir/etc/environment - > $initdir/etc/machine-id - - # set the hostname - echo systemd-testsuite > $initdir/etc/hostname - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - cat >$initdir/etc/fstab <<EOF -LABEL=systemd / ext3 rw 0 1 -EOF - - # setup the testsuite target and the test ending service - cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/ + setup_basic_environment # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF @@ -141,100 +66,9 @@ EOF $initdir/etc/systemd/system cp test-jobs.sh $initdir/ - 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 - mkdir -p $initdir/etc/rc.d - cat >$initdir/etc/rc.d/rc.local <<EOF -#!/bin/bash -exit 0 -EOF - chmod 0755 $initdir/etc/rc.d/rc.local - # install basic tools needed - dracut_install sh bash setsid loadkeys setfont \ - login sushell sulogin gzip sleep echo mount umount cryptsetup date - dracut_install dmsetup modprobe - - # install libnss_files for login - inst_libdir_file "libnss_files*" - - # install dbus and pam - find \ - /etc/dbus-1 \ - /etc/pam.d \ - /etc/security \ - /lib64/security \ - /lib/security -xtype f \ - | while read file; do - inst $file - done - - # install dbus socket and service file - inst /usr/lib/systemd/system/dbus.socket - inst /usr/lib/systemd/system/dbus.service - - # install basic keyboard maps and fonts - for i in \ - /usr/lib/kbd/consolefonts/latarcyrheb-sun16* \ - /usr/lib/kbd/keymaps/include/* \ - /usr/lib/kbd/keymaps/i386/include/* \ - /usr/lib/kbd/keymaps/i386/qwerty/us.*; do - [[ -f $i ]] || continue - inst $i - done - - # some basic terminfo files - for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - - # softlink mtab - ln -fs /proc/self/mounts $initdir/etc/mtab - - # install any Exec's from the service files - egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \ - | while read i; do - i=${i##Exec*=}; i=${i##-} - inst $i - done - - # install plymouth, if found... else remove plymouth service files - # if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then - # PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ - # /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir - # dracut_install plymouth plymouthd - # else - rm -f $initdir/{usr/lib,etc}/systemd/system/plymouth* $initdir/{usr/lib,etc}/systemd/system/*/plymouth* - # fi - - # some helper tools for debugging - [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS - - # install ld.so.conf* and run ldconfig - cp -a /etc/ld.so.conf* $initdir/etc - ldconfig -r "$initdir" - ddebug "Strip binaeries" - find "$initdir" -perm +111 -type f | xargs strip --strip-unneeded | ddebug - - # copy depmod files - inst /lib/modules/$KERNEL_VER/modules.order - inst /lib/modules/$KERNEL_VER/modules.builtin - # generate module dependencies - if [[ -d $initdir/lib/modules/$KERNEL_VER ]] && \ - ! depmod -a -b "$initdir" $KERNEL_VER; then - dfatal "\"depmod -a $KERNEL_VER\" failed." - exit 1 - fi + setup_testsuite ) - rm -fr $TESTDIR/nspawn-root - 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 + setup_nspawn_root ddebug "umount $TESTDIR/root" umount $TESTDIR/root diff --git a/test/test-functions b/test/test-functions index 0587cd4feb..a184ed7e32 100644 --- a/test/test-functions +++ b/test/test-functions @@ -7,7 +7,255 @@ export PATH KERNEL_VER=${KERNEL_VER-$(uname -r)} KERNEL_MODS="/lib/modules/$KERNEL_VER/" +BASICTOOLS="sh bash setsid loadkeys setfont login sushell sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe" +DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort" + +run_qemu() { + qemu-kvm \ + -hda $TESTDIR/rootdisk.img \ + -m 512M -nographic \ + -net none -kernel /boot/vmlinuz-$KERNEL_VER \ + -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd ro console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" || return 1 +} + +run_nspawn() { + ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root /usr/lib/systemd/systemd +} + +setup_basic_environment() { + # create the basic filesystem layout + setup_basic_dirs + + install_systemd + install_missing_libraries + install_config_files + create_rc_local + install_basic_tools + install_libnss + install_pam + install_dbus + install_fonts + install_keymaps + install_terminfo + install_execs + install_plymouth + install_debug_tools + install_ld_so_conf + strip_binaries + install_depmod_files + generate_module_dependencies + # softlink mtab + ln -fs /proc/self/mounts $initdir/etc/mtab +} + +install_dmevent() { + instmods dm_crypt =crypto + type -P dmeventd >/dev/null && dracut_install dmeventd + inst_libdir_file "libdevmapper-event.so*" + inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules +} + +install_systemd() { + # install compiled files + (cd $TEST_BASE_DIR/..; make DESTDIR=$initdir install) + # remove unneeded documentation + rm -fr $initdir/usr/share/{man,doc,gtk-doc} + # we strip binaries since debug symbols increase binaries size a lot + # and it could fill the available space + strip_binaries +} + +install_missing_libraries() { + # install possible missing libraries + for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do + inst_libs $i + done +} + +create_empty_image() { + rm -f $TESTDIR/rootdisk.img + # Create the blank file to use as a root filesystem + dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=200 + LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img) + [ -b $LOOPDEV ] || return 1 + echo "LOOPDEV=$LOOPDEV" >> $STATEFILE + sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF +,3200 +, +EOF + + mkfs.ext3 -L systemd ${LOOPDEV}p1 +} + +check_result_nspawn() { + ret=1 + [[ -e $TESTDIR/nspawn-root/testok ]] && ret=0 + [[ -f $TESTDIR/nspawn-root/failed ]] && cp -a $TESTDIR/nspawn-root/failed $TESTDIR + cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR + [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed + ls -l $TESTDIR/journal/*/*.journal + test -s $TESTDIR/failed && ret=$(($ret+1)) + return $ret +} + +strip_binaries() { + ddebug "Strip binaries" + find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug +} + +create_rc_local() { + mkdir -p $initdir/etc/rc.d + cat >$initdir/etc/rc.d/rc.local <<EOF +#!/bin/bash +exit 0 +EOF + chmod 0755 $initdir/etc/rc.d/rc.local +} + +install_execs() { + # install any Execs from the service files + egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \ + | while read i; do + i=${i##Exec*=}; i=${i##-} + inst $i + done +} + +generate_module_dependencies() { + if [[ -d $initdir/lib/modules/$KERNEL_VER ]] && \ + ! depmod -a -b "$initdir" $KERNEL_VER; then + dfatal "\"depmod -a $KERNEL_VER\" failed." + exit 1 + fi +} + +install_depmod_files() { + inst /lib/modules/$KERNEL_VER/modules.order + inst /lib/modules/$KERNEL_VER/modules.builtin +} + +install_plymouth() { + # install plymouth, if found... else remove plymouth service files + # if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then + # PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ + # /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir + # dracut_install plymouth plymouthd + # else + rm -f $initdir/{usr/lib,etc}/systemd/system/plymouth* $initdir/{usr/lib,etc}/systemd/system/*/plymouth* + # fi +} + +install_ld_so_conf() { + cp -a /etc/ld.so.conf* $initdir/etc + ldconfig -r "$initdir" +} + +install_config_files() { + inst /etc/sysconfig/init + inst /etc/passwd + inst /etc/shadow + inst /etc/group + inst /etc/shells + inst /etc/nsswitch.conf + inst /etc/pam.conf + inst /etc/securetty + inst /etc/os-release + inst /etc/localtime + # we want an empty environment + > $initdir/etc/environment + > $initdir/etc/machine-id + # set the hostname + echo systemd-testsuite > $initdir/etc/hostname + # fstab + cat >$initdir/etc/fstab <<EOF +LABEL=systemd / ext3 rw 0 1 +EOF +} + +install_basic_tools() { + [[ $BASICTOOLS ]] && dracut_install $BASICTOOLS +} + +install_debug_tools() { + [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS +} + +install_libnss() { + # install libnss_files for login + inst_libdir_file "libnss_files*" +} + +install_dbus() { + inst /usr/lib/systemd/system/dbus.socket + inst /usr/lib/systemd/system/dbus.service + + find \ + /etc/dbus-1 -xtype f \ + | while read file; do + inst $file + done +} + +install_pam() { + find \ + /etc/pam.d \ + /etc/security \ + /lib64/security \ + /lib/security -xtype f \ + | while read file; do + inst $file + done +} + +install_keymaps() { + for i in \ + /usr/lib/kbd/keymaps/include/* \ + /usr/lib/kbd/keymaps/i386/include/* \ + /usr/lib/kbd/keymaps/i386/qwerty/us.*; do + [[ -f $i ]] || continue + inst $i + done +} + +install_fonts() { + for i in \ + /usr/lib/kbd/consolefonts/latarcyrheb-sun16*; do + [[ -f $i ]] || continue + inst $i + done +} + +install_terminfo() { + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux +} + +setup_testsuite() { + cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/ + + mkdir -p $initdir/etc/systemd/system/testsuite.target.wants + ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service + ln -fs $TEST_BASE_DIR/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 +} + +setup_nspawn_root() { + rm -fr $TESTDIR/nspawn-root + ddebug "cp -ar $initdir $TESTDIR/nspawn-root" + cp -ar $initdir $TESTDIR/nspawn-root + # we don't mount in the nspawn root + rm -f $TESTDIR/nspawn-root/etc/fstab +} + setup_basic_dirs() { + mkdir -p $initdir/run + mkdir -p $initdir/etc/systemd/system + mkdir -p $initdir/var/log/journal + for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log dev proc sys sysroot root run run/lock run/initramfs; do if [ -L "/$d" ]; then inst_symlink "/$d" @@ -55,6 +303,11 @@ import_testdir() { fi } +import_initdir() { + initdir=$TESTDIR/root + export initdir +} + ## @brief Converts numeric logging level to the first letter of level name. # # @param lvl Numeric logging level in range from 1 to 6. @@ -815,6 +1068,7 @@ do_test() { done import_testdir + import_initdir while (($# > 0)); do case $1 in |