daandemeyer / rpms / systemd

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