X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Ftest-functions;h=5fdf0a18bd72679662cf5dc8ab82cad45ca76d9c;hb=1ecf6a2b4960229ad1d06c591b4776ddf065e834;hp=d0c5f6ca9e2ecc5f77f5749cc74f815959fd3510;hpb=898720b7e9cf3bdf7a93e435cbed5dd6942ecf9b;p=elogind.git

diff --git a/test/test-functions b/test/test-functions
index d0c5f6ca9..5fdf0a18b 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -574,9 +574,21 @@ inst_libdir_file() {
     fi
 }
 
+check_qemu() {
+    command -v qemu-kvm &>/dev/null && [[ -c /dev/kvm ]]
+}
+
+check_nspawn() {
+    [[ -d /sys/fs/cgroup/systemd ]]
+}
+
+
 do_test() {
-    [[ $UID != "0" ]] && exit 0
-    command -v qemu-kvm &>/dev/null || exit 0
+    if [[ $UID != "0" ]]; then
+        echo "TEST: $TEST_DESCRIPTION [SKIPPED]: not root" >&2
+        exit 0
+    fi
+
 # Detect lib paths
     [[ $libdir ]] || for libdir in /lib64 /lib; do
         [[ -d $libdir ]] && libdirs+=" $libdir" && break