From: Harald Hoyer <harald@redhat.com>
Date: Fri, 25 May 2012 16:31:58 +0000 (+0200)
Subject: test/test-functions: add check_qemu() and check_nspawn() functions
X-Git-Tag: v184~31
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ecf6a2b4960229ad1d06c591b4776ddf065e834;p=systemd

test/test-functions: add check_qemu() and check_nspawn() functions
---

diff --git a/test/test-functions b/test/test-functions
index 84ce1e94..5fdf0a18 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -574,22 +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() {
     if [[ $UID != "0" ]]; then
         echo "TEST: $TEST_DESCRIPTION [SKIPPED]: not root" >&2
         exit 0
     fi
 
-    if ! command -v qemu-kvm &>/dev/null; then
-        echo "TEST: $TEST_DESCRIPTION [SKIPPED]: no qemu-kvm found" >&2
-        exit 0
-    fi
-
-    if ! [[ -c /dev/kvm ]]; then
-        echo "TEST: $TEST_DESCRIPTION [SKIPPED]: /dev/kvm not found" >&2
-        exit 0
-    fi
-
 # Detect lib paths
     [[ $libdir ]] || for libdir in /lib64 /lib; do
         [[ -d $libdir ]] && libdirs+=" $libdir" && break