test: move most of TEST-06-* setup to static files

diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh
index 46dc1cd805e36a430bd25554c33124d7664aad3b..5f22b3b74e1ca89f5d48601487d75c17f5e4010b 100755 (executable)
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@@ -26,49 +26,6 @@ test_setup() {
         setup_basic_environment
         mask_supporting_services
 
-        # setup the testsuite service
-        cat <<EOF >$initdir/etc/systemd/system/testsuite.service
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/test-selinux-checks.sh
-Type=oneshot
-EOF
-
-        cat <<EOF >$initdir/etc/systemd/system/hola.service
-[Service]
-Type=oneshot
-ExecStart=/bin/echo Start Hola
-ExecReload=/bin/echo Reload Hola
-ExecStop=/bin/echo Stop Hola
-RemainAfterExit=yes
-EOF
-
-        setup_testsuite
-
-        cat <<EOF >$initdir/etc/systemd/system/load-systemd-test-module.service
-[Unit]
-Description=Load systemd-test module
-DefaultDependencies=no
-Requires=local-fs.target
-Conflicts=shutdown.target
-After=local-fs.target
-Before=sysinit.target shutdown.target autorelabel.service
-ConditionSecurity=selinux
-ConditionPathExists=|/.load-systemd-test-module
-
-[Service]
-ExecStart=/bin/sh -x -c 'echo 0 >/sys/fs/selinux/enforce && cd /systemd-test-module && make -f /usr/share/selinux/devel/Makefile load  && rm /.load-systemd-test-module'
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-EOF
-
-        touch $initdir/.load-systemd-test-module
-        mkdir -p $initdir/etc/systemd/system/basic.target.wants
-        ln -fs load-systemd-test-module.service $initdir/etc/systemd/system/basic.target.wants/load-systemd-test-module.service
-
         local _modules_dir=/var/lib/selinux
         rm -rf $initdir/$_modules_dir
         if ! cp -ar $_modules_dir $initdir/$_modules_dir; then
@@ -87,11 +44,10 @@ EOF
         mkdir $initdir/systemd-test-module
         cp systemd_test.te $initdir/systemd-test-module
         cp systemd_test.if $initdir/systemd-test-module
-        cp test-selinux-checks.sh $initdir
         dracut_install -o sesearch
         dracut_install runcon
         dracut_install checkmodule semodule semodule_package m4 make /usr/libexec/selinux/hll/pp load_policy sefcontext_compile
     )
 }
 
-do_test "$@"
+do_test "$@" 06

diff --git a/test/meson.build b/test/meson.build
index 15b4c49ff9ec28275ac4fc4f86febf4bec930bd1..e667076d4c3d95d328a2abf9715a58a5b690bddd 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -14,6 +14,8 @@ install_subdir('test-umount',
                install_dir : testdata_dir)
 install_subdir('testsuite-04.units',
                install_dir : testdata_dir)
+install_subdir('testsuite-06.units',
+               install_dir : testdata_dir)
 
 if conf.get('ENABLE_RESOLVE') == 1
         install_subdir('test-resolve',

diff --git a/test/testsuite-06.units/hola.service b/test/testsuite-06.units/hola.service
new file mode 100644 (file)
index 0000000..5dc6332
--- /dev/null
+++ b/test/testsuite-06.units/hola.service
@@ -0,0 +1,6 @@
+[Service]
+Type=oneshot
+ExecStart=/bin/echo Start Hola
+ExecReload=/bin/echo Reload Hola
+ExecStop=/bin/echo Stop Hola
+RemainAfterExit=yes

diff --git a/test/testsuite-06.units/load-systemd-test-module.service b/test/testsuite-06.units/load-systemd-test-module.service
new file mode 100644 (file)
index 0000000..323a76c
--- /dev/null
+++ b/test/testsuite-06.units/load-systemd-test-module.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Load systemd-test module
+DefaultDependencies=no
+Requires=local-fs.target
+Conflicts=shutdown.target
+After=local-fs.target
+Before=sysinit.target shutdown.target autorelabel.service
+ConditionSecurity=selinux
+
+[Service]
+ExecStart=sh -x -c 'echo 0 >/sys/fs/selinux/enforce && cd /systemd-test-module && make -f /usr/share/selinux/devel/Makefile load'
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes

diff --git a/test/units/testsuite-06.service b/test/units/testsuite-06.service
new file mode 100644 (file)
index 0000000..72c0a2c
--- /dev/null
+++ b/test/units/testsuite-06.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TEST-06-SELINUX
+
+Requires=load-systemd-test-module.service
+After=load-systemd-test-module.service
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot

diff --git a/test/TEST-06-SELINUX/test-selinux-checks.sh b/test/units/testsuite-06.sh
similarity index 100%
rename from test/TEST-06-SELINUX/test-selinux-checks.sh
rename to test/units/testsuite-06.sh