From 097d8c6eb7909d9ecd49562855bb8c9a9e59cefb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 10 Dec 2019 09:54:36 +0100
Subject: [PATCH] test: move TEST-36-NUMAPOLICY setup to static files

No need to call setup_nspawn_root() if we plan to only run under qemu.
---
 test/TEST-36-NUMAPOLICY/test.sh                 | 17 +----------------
 test/units/testsuite-36.service                 |  6 ++++++
 .../testsuite.sh => units/testsuite-36.sh}      |  0
 3 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 test/units/testsuite-36.service
 rename test/{TEST-36-NUMAPOLICY/testsuite.sh => units/testsuite-36.sh} (100%)

diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
index 29addc958b3..1956d5271d2 100755
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -16,22 +16,7 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-        dracut_install mktemp
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/bin/bash -x /testsuite.sh
-Type=oneshot
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
     )
-    setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 36
diff --git a/test/units/testsuite-36.service b/test/units/testsuite-36.service
new file mode 100644
index 00000000000..f2dcbead69f
--- /dev/null
+++ b/test/units/testsuite-36.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-36-NUMAPOLICY
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/TEST-36-NUMAPOLICY/testsuite.sh b/test/units/testsuite-36.sh
similarity index 100%
rename from test/TEST-36-NUMAPOLICY/testsuite.sh
rename to test/units/testsuite-36.sh
-- 
2.47.3