From 7d4a62f8c1404ed426500b97af03d4ef8d034a71 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 15 Nov 2012 10:33:16 -0500 Subject: Isolation of udev code from remaining systemd This commit is a first attempt to isolate the udev code from the remaining code base. It intentionally does not modify any files but purely delete files which, on a first examination, appear to not be needed. This is a sweeping commit which may easily have missed needed code. Files can be retrieved by doing a checkout from the previous commit: git checkout 2944f347d0 -- --- test/TEST-01-BASIC/Makefile | 10 -- test/TEST-01-BASIC/test.sh | 252 -------------------------------------------- 2 files changed, 262 deletions(-) delete mode 100644 test/TEST-01-BASIC/Makefile delete mode 100755 test/TEST-01-BASIC/test.sh (limited to 'test/TEST-01-BASIC') diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile deleted file mode 100644 index 5e89a29eff..0000000000 --- a/test/TEST-01-BASIC/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -all: - @make -s --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all -setup: - @make --no-print-directory -C ../.. all - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup -clean: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean -run: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh deleted file mode 100755 index eb6a80a07c..0000000000 --- a/test/TEST-01-BASIC/test.sh +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/bash -# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -# ex: ts=8 sw=4 sts=4 et filetype=sh -TEST_DESCRIPTION="Basic systemd setup" - -KVERSION=${KVERSION-$(uname -r)} -KERNEL_VER=$(uname -r) - -# 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 - - 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 - umount $TESTDIR/root - 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 --capability=CAP_AUDIT_CONTROL,CAP_AUDIT_WRITE /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=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 <$TESTDIR/keyfile - 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 <$initdir/etc/systemd/system/testsuite.target <$initdir/etc/systemd/system/testsuite.service < /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 - - # 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 </dev/null - [[ $LOOPDEV ]] && losetup -d $LOOPDEV - return 0 -} - -. $TEST_BASE_DIR/test-functions -do_test "$@" -- cgit v1.2.3-54-g00ecf