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