36e8a3
From 13d819cc795d8c3695ce7288436ad569366073f6 Mon Sep 17 00:00:00 2001
36e8a3
From: Michael Biebl <biebl@debian.org>
36e8a3
Date: Mon, 16 Jul 2018 11:27:44 +0200
36e8a3
Subject: [PATCH] test: Drop SKIP_INITRD for QEMU-based tests
36e8a3
36e8a3
Not all distros support booting without an initrd. E.g. the Debian
36e8a3
kernel builds ext4 as a module and so relies on an initrd to
36e8a3
successfully start the QEMU-based images.
36e8a3
36e8a3
Cherry-picked from: c2d4da002095fe6f86f89a508a81e48fb6d3196f
36e8a3
---
36e8a3
 test/TEST-08-ISSUE-2730/test.sh   | 1 -
36e8a3
 test/TEST-09-ISSUE-2691/test.sh   | 1 -
36e8a3
 test/TEST-10-ISSUE-2467/test.sh   | 1 -
36e8a3
 test/TEST-11-ISSUE-3166/test.sh   | 1 -
36e8a3
 test/TEST-13-NSPAWN-SMOKE/test.sh | 2 +-
36e8a3
 test/TEST-14-MACHINE-ID/test.sh   | 2 +-
36e8a3
 6 files changed, 2 insertions(+), 6 deletions(-)
36e8a3
36e8a3
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
36e8a3
index 68159c331..90bf133c6 100755
36e8a3
--- a/test/TEST-08-ISSUE-2730/test.sh
36e8a3
+++ b/test/TEST-08-ISSUE-2730/test.sh
36e8a3
@@ -6,7 +6,6 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2730"
36e8a3
 TEST_NO_NSPAWN=1
36e8a3
 
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
-SKIP_INITRD=yes
36e8a3
 QEMU_TIMEOUT=180
36e8a3
 FSTYPE=ext4
36e8a3
 
36e8a3
diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
36e8a3
index 4c3e9496b..9b5990bc6 100755
36e8a3
--- a/test/TEST-09-ISSUE-2691/test.sh
36e8a3
+++ b/test/TEST-09-ISSUE-2691/test.sh
36e8a3
@@ -6,7 +6,6 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2691"
36e8a3
 TEST_NO_NSPAWN=1
36e8a3
 
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
-SKIP_INITRD=yes
36e8a3
 QEMU_TIMEOUT=90
36e8a3
 
36e8a3
 test_setup() {
36e8a3
diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh
36e8a3
index 2f95e9062..e61f5acd3 100755
36e8a3
--- a/test/TEST-10-ISSUE-2467/test.sh
36e8a3
+++ b/test/TEST-10-ISSUE-2467/test.sh
36e8a3
@@ -5,7 +5,6 @@ set -e
36e8a3
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467"
36e8a3
 
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
-SKIP_INITRD=yes
36e8a3
 
36e8a3
 test_setup() {
36e8a3
     create_empty_image
36e8a3
diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
36e8a3
index 4602bdfc9..8aae4d5ed 100755
36e8a3
--- a/test/TEST-11-ISSUE-3166/test.sh
36e8a3
+++ b/test/TEST-11-ISSUE-3166/test.sh
36e8a3
@@ -6,7 +6,6 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3166"
36e8a3
 TEST_NO_NSPAWN=1
36e8a3
 
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
-SKIP_INITRD=yes
36e8a3
 
36e8a3
 test_setup() {
36e8a3
     create_empty_image
36e8a3
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
36e8a3
index c0789b5d2..a676384bf 100755
36e8a3
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
36e8a3
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
36e8a3
@@ -4,7 +4,7 @@
36e8a3
 set -e
36e8a3
 TEST_DESCRIPTION="systemd-nspawn smoke test"
36e8a3
 TEST_NO_NSPAWN=1
36e8a3
-SKIP_INITRD=yes
36e8a3
+
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
 
36e8a3
 test_setup() {
36e8a3
diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh
36e8a3
index 7342645bc..62003b91b 100755
36e8a3
--- a/test/TEST-14-MACHINE-ID/test.sh
36e8a3
+++ b/test/TEST-14-MACHINE-ID/test.sh
36e8a3
@@ -4,7 +4,7 @@
36e8a3
 set -e
36e8a3
 TEST_DESCRIPTION="/etc/machine-id testing"
36e8a3
 TEST_NO_NSPAWN=1
36e8a3
-SKIP_INITRD=yes
36e8a3
+
36e8a3
 . $TEST_BASE_DIR/test-functions
36e8a3
 
36e8a3
 test_setup() {