From b152adbfa9b708dade8559b9962241902bf2eb7c Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Thu, 17 Jun 2021 22:53:16 +0100
Subject: [PATCH] test-loop-block: run in qemu

test-loop-block needs to run in qemu, so we are currently not
testing it in the CI. Run it by itself in a separate job from
TEST-02-UNITTESTS to avoid slowing that suite down.

Fixes https://github.com/systemd/systemd/issues/19966

Disable it in the bionic-* CI for now, as it's affected by
the same uevent ordering issue as TEST-50-DISSECT which makes
it flaky.
---
 test/TEST-61-UNITTESTS-QEMU/Makefile          |  1 +
 .../deny-list-ubuntu-ci                       |  0
 test/TEST-61-UNITTESTS-QEMU/test.sh           | 27 +++++++++++++++++++
 test/units/testsuite-61.service               |  7 +++++
 test/units/testsuite-61.sh                    |  8 ++++++
 5 files changed, 43 insertions(+)
 create mode 120000 test/TEST-61-UNITTESTS-QEMU/Makefile
 create mode 100644 test/TEST-61-UNITTESTS-QEMU/deny-list-ubuntu-ci
 create mode 100755 test/TEST-61-UNITTESTS-QEMU/test.sh
 create mode 100644 test/units/testsuite-61.service
 create mode 100755 test/units/testsuite-61.sh

diff --git a/test/TEST-61-UNITTESTS-QEMU/Makefile b/test/TEST-61-UNITTESTS-QEMU/Makefile
new file mode 120000
index 00000000000..e9f93b1104c
--- /dev/null
+++ b/test/TEST-61-UNITTESTS-QEMU/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/TEST-61-UNITTESTS-QEMU/deny-list-ubuntu-ci b/test/TEST-61-UNITTESTS-QEMU/deny-list-ubuntu-ci
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/TEST-61-UNITTESTS-QEMU/test.sh b/test/TEST-61-UNITTESTS-QEMU/test.sh
new file mode 100755
index 00000000000..0f793bbee36
--- /dev/null
+++ b/test/TEST-61-UNITTESTS-QEMU/test.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+
+TEST_DESCRIPTION="Run unit tests under qemu"
+# this subset of unit tests requires qemu, so they are ran here to avoid slowing down TEST-02
+TEST_NO_NSPAWN=1
+
+# embed some newlines in the kernel command line to stress our test suite
+KERNEL_APPEND="
+
+frobnicate!
+
+$KERNEL_APPEND
+"
+
+# shellcheck source=test/test-functions
+. "${TEST_BASE_DIR:?}/test-functions"
+
+check_result_nspawn() {
+    check_result_nspawn_unittests "${1}"
+}
+
+check_result_qemu() {
+    check_result_qemu_unittests
+}
+
+do_test "$@"
diff --git a/test/units/testsuite-61.service b/test/units/testsuite-61.service
new file mode 100644
index 00000000000..908ff7ef5d1
--- /dev/null
+++ b/test/units/testsuite-61.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=TEST-61-UNITTESTS-QEMU
+
+[Service]
+ExecStartPre=rm -f /failed /testok
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/units/testsuite-61.sh b/test/units/testsuite-61.sh
new file mode 100755
index 00000000000..0810de2051f
--- /dev/null
+++ b/test/units/testsuite-61.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -eux
+set -o pipefail
+
+TESTS_GLOB="test-loop-block"
+. $(dirname $0)/testsuite-02.sh
+
+exit 0
-- 
2.47.3