]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: don't rely on system's machined 1991/head
authorEvgeny Vereshchagin <evvers@ya.ru>
Mon, 23 Nov 2015 04:36:39 +0000 (04:36 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Tue, 24 Nov 2015 14:33:16 +0000 (14:33 +0000)
Fixes backward/forward incompatibility errors on spawning.

For example:
$ sudo make run
...
Failed to register machine: Cannot set property TasksMax, or unknown
property.

$ ../../systemd-nspawn --version
systemd 228

$ systemd-nspawn --version
systemd 225

test/test-functions

index fca163a979a88c16fe745698c90f10dadd264738..a5644eaf73151b44d854d2fd3203ff46be8e64cd 100644 (file)
@@ -92,7 +92,7 @@ $KERNEL_APPEND \
 
 run_nspawn() {
     set -x
-    ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
+    ../../systemd-nspawn --register=no --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
 }
 
 setup_basic_environment() {
@@ -1135,8 +1135,7 @@ inst_libdir_file() {
 
 check_nspawn() {
     [[ -d /sys/fs/cgroup/systemd ]] && \
-    [[ -d /run/systemd/system ]] && \
-    [[ -e /lib/systemd/systemd-machined ]]
+    [[ -d /run/systemd/system ]]
 }