X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Ftest-functions;h=dac0dcccfb65b4309f6decd731a99042fd6c3c33;hp=87d3a73e753c15ddb501cce62aa6be817c9330c3;hb=c2142cf1d1276f4f220bdd9af4ff7a716cc7a305;hpb=c6a77179a4097df355f0f04b8f3260c76b5e515c

diff --git a/test/test-functions b/test/test-functions
index 87d3a73e7..dac0dcccf 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -66,11 +66,13 @@ $KERNEL_APPEND \
         QEMU_OPTIONS="$QEMU_OPTIONS -initrd $INITRD"
     fi
 
-    $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img || return 1
+    ( set -x
+      $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img ) || return 1
 }
 
 run_nspawn() {
-    ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root /usr/lib/systemd/systemd
+    set -x
+    ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root /usr/lib/systemd/systemd $KERNEL_APPEND
 }
 
 setup_basic_environment() {
@@ -108,7 +110,7 @@ install_dmevent() {
 
 install_systemd() {
     # install compiled files
-    (cd $TEST_BASE_DIR/..; make DESTDIR=$initdir install)
+    (cd $TEST_BASE_DIR/..; set -x; 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
@@ -124,18 +126,18 @@ install_missing_libraries() {
 }
 
 create_empty_image() {
-    rm -f $TESTDIR/rootdisk.img
+    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
+    dd if=/dev/null of="$TESTDIR/rootdisk.img" bs=1M seek=300
     LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img)
-    [ -b $LOOPDEV ] || return 1
+    [ -b "$LOOPDEV" ] || return 1
     echo "LOOPDEV=$LOOPDEV" >> $STATEFILE
-    sfdisk -C 6400 -H 2 -S 32 -L $LOOPDEV <<EOF
-,3200
+    sfdisk -C 9600 -H 2 -S 32 -L "$LOOPDEV" <<EOF
+,4800
 ,
 EOF
 
-    mkfs.ext3 -L systemd ${LOOPDEV}p1
+    mkfs.ext3 -L systemd "${LOOPDEV}p1"
 }
 
 check_result_nspawn() {