X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2FTEST-01-BASIC%2Ftest.sh;h=9b55a27a20ff2524290589f29ba02c9d8a605f87;hb=f405e86de361ec305dc2b8634efeaa23dc144053;hp=ace159f59ae268b8f9d321df5f02ffd762146896;hpb=3d3035e80c7deab9b0bf7050228385664a022fe3;p=elogind.git

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index ace159f59..9b55a27a2 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -3,23 +3,26 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 TEST_DESCRIPTION="Basic systemd setup"
 
-KVERSION=${KVERSION-$(uname -r)}
+. $TEST_BASE_DIR/test-functions
 
 # 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"
 
-test_run() {
+run_qemu() {
+    # TODO: qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html
     qemu-kvm \
         -hda $TESTDIR/rootdisk.img \
-        -m 256M -nographic \
-        -net none -kernel /boot/vmlinuz-$KVERSION \
-        -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd rw console=ttyS0,115200n81 selinux=0 $DEBUGFAIL"
+        -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
+
     ret=1
     mkdir -p $TESTDIR/root
     mount ${LOOPDEV}p1 $TESTDIR/root
     [[ -e $TESTDIR/root/testok ]] && ret=0
-    cp -a $TESTDIR/root/var/log/journal $TESTDIR
     cp -a $TESTDIR/root/failed $TESTDIR
+    cp -a $TESTDIR/root/var/log/journal $TESTDIR
     umount $TESTDIR/root
     cat $TESTDIR/failed
     ls -l $TESTDIR/journal/*/*.journal
@@ -27,23 +30,52 @@ test_run() {
     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
+    else
+        dwarn "can't run qemu-kvm, skipping"
+    fi
+    if check_nspawn; then
+        run_nspawn || return 1
+    else
+        dwarn "can't run systemd-nspawn, skipping"
+    fi
+    return 0
+}
+
 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=100
+    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 3200 -H 2 -S 32 -L $LOOPDEV <<EOF
+    sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF
+,3200
 ,
 EOF
 
     mkfs.ext3 -L systemd ${LOOPDEV}p1
+    echo -n test >$TESTDIR/keyfile
     mkdir -p $TESTDIR/root
     mount ${LOOPDEV}p1 $TESTDIR/root
     mkdir -p $TESTDIR/root/run
 
-    kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay
     (
         LOG_LEVEL=5
@@ -55,61 +87,61 @@ EOF
         # 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
+        for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do
             inst_libs $i
         done
 
-        # activate kmsg import
-	echo 'ImportKernel=yes' >> $initdir/etc/systemd/journald.conf
-
         # make a journal directory
-	mkdir -p $initdir/var/log/journal
+        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/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/environment
+        > $initdir/etc/machine-id
 
         # set the hostname
-	echo  systemd-testsuite > $initdir/etc/hostname
+        echo  systemd-testsuite > $initdir/etc/hostname
 
-        # 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
+        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 the testsuite service
-	cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 After=multi-user.target
 
 [Service]
-ExecStart=/bin/sh -c 'systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok'
-ExecStartPost=/usr/sbin/poweroff
+ExecStart=/bin/bash -c 'set -x; ( systemctl --failed --no-legend --no-pager; systemctl status --failed ) > /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;'
 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
+
+        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
+        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
@@ -118,13 +150,14 @@ 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
+            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 \
+        find \
             /etc/dbus-1 \
             /etc/pam.d \
             /etc/security \
@@ -135,29 +168,29 @@ EOF
         done
 
         # install dbus socket and service file
-	inst /usr/lib/systemd/system/dbus.socket
-	inst /usr/lib/systemd/system/dbus.service
+        inst /usr/lib/systemd/system/dbus.socket
+        inst /usr/lib/systemd/system/dbus.service
 
         # install basic keyboard maps and fonts
-	for i in \
+        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
+                [[ -f $i ]] || continue
+                inst $i
+        done
 
         # some basic terminfo files
-	for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
+        for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
-	done
-	dracut_install -o ${_terminfodir}/l/linux
+        done
+        dracut_install -o ${_terminfodir}/l/linux
 
         # softlink mtab
-	ln -fs /proc/self/mounts $initdir/etc/mtab
+        ln -fs /proc/self/mounts $initdir/etc/mtab
 
-        # install any Exec's from the service files
+        # install any Execs from the service files
         egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
             | while read i; do
             i=${i##Exec*=}; i=${i##-}
@@ -165,27 +198,41 @@ EOF
         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/systemd/system/plymouth* $initdir/usr/lib/systemd/system/*/plymouth*
-        fi
+        # 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
-	dracut_install sh df free ls shutdown poweroff \
-            stty cat ps ln ip route \
-	    mount dmesg dhclient mkdir cp ping dhclient \
-	    umount strace less grep id tty touch
+        [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS
 
         # install ld.so.conf* and run ldconfig
-	cp -a /etc/ld.so.conf* $initdir/etc
-	ldconfig -r "$initdir"
-
+        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
     )
-    umount $TESTDIR/root
+    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
 
+    ddebug "umount $TESTDIR/root"
+    umount $TESTDIR/root
 }
 
 test_cleanup() {
@@ -194,5 +241,4 @@ test_cleanup() {
     return 0
 }
 
-. $TEST_BASE_DIR/test-functions
 do_test "$@"