X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2FTEST-01-BASIC%2Ftest.sh;h=d97fbe24d492a71b49084ae630dd6780f6a81728;hb=d31e10967752dcc4ee3a8b16228f434c288b5a1b;hp=13b731d94d8b3947090a6baa491c7dd2e55b6120;hpb=898720b7e9cf3bdf7a93e435cbed5dd6942ecf9b;p=elogind.git

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 13b731d94..d97fbe24d 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -3,181 +3,66 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 TEST_DESCRIPTION="Basic systemd setup"
 
-KVERSION=${KVERSION-$(uname -r)}
-
-# Uncomment this to debug failures
-#DEBUGFAIL="systemd.unit=multi-user.target"
+. $TEST_BASE_DIR/test-functions
 
-test_run() {
-    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"
+check_result_qemu() {
     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
+    [[ -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
+    [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
     ls -l $TESTDIR/journal/*/*.journal
+    test -s $TESTDIR/failed && ret=$(($ret+1))
     return $ret
 }
 
-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
-    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
-,
-EOF
+test_run() {
+    if run_qemu; then
+        check_result_qemu || return 1
+    else
+        dwarn "can't run QEMU, skipping"
+    fi
+    if check_nspawn; then
+        run_nspawn
+        check_result_nspawn || return 1
+    else
+        dwarn "can't run systemd-nspawn, skipping"
+    fi
+    return 0
+}
 
-    mkfs.ext3 -L systemd ${LOOPDEV}p1
+test_setup() {
+    create_empty_image
     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
-	initdir=$TESTDIR/root
+        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
-        # create the basic filesystem layout
-        setup_basic_dirs
-
-        # install compiled files
-        (cd ../..; make DESTDIR=$initdir install)
-
-        # install possible missing libraries
-	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
-
-        # 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
-
-        # we want an empty environment
-	> $initdir/etc/environment
-
-        # set the 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
-EOF
+        setup_basic_environment
 
         # 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 'echo OK > /testok; /bin/sleep 5'
-ExecStartPost=/usr/sbin/poweroff
+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;'
 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
-
-        # make the testsuite the default target
-	ln -fs testsuite.target $initdir/etc/systemd/system/default.target
-
-        # install basic tools needed
-        dracut_install sh bash setsid loadkeys setfont \
-            login sushell sulogin gzip sleep echo
-
-        # 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/systemd/system/plymouth* $initdir/usr/lib/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
-
-        # install ld.so.conf* and run ldconfig
-	cp -a /etc/ld.so.conf* $initdir/etc
-	ldconfig -r "$initdir"
 
+        setup_testsuite
     )
-    umount $TESTDIR/root
+    setup_nspawn_root
 
+    ddebug "umount $TESTDIR/root"
+    umount $TESTDIR/root
 }
 
 test_cleanup() {
@@ -186,5 +71,4 @@ test_cleanup() {
     return 0
 }
 
-. $TEST_BASE_DIR/test-functions
 do_test "$@"