diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-10 09:32:44 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:46:47 +0100 |
| commit | 94370e627fe62d20557832765bb733ac2bcde6c6 (patch) | |
| tree | b2d03c304baeb6f06ad75589a8de4a345c273ca5 /test | |
| parent | 468874997a274e5ba576f82f6fd201692507525b (diff) | |
| download | systemd-94370e627fe62d20557832765bb733ac2bcde6c6.tar.gz | |
test: move TEST-28-PERCENTJ-WANTEDBY setup to static files
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-28-PERCENTJ-WANTEDBY/test.sh | 36 | ||||
| -rw-r--r-- | test/meson.build | 2 | ||||
| -rw-r--r-- | test/testsuite-28.units/specifier-j-depends-wants.service | 6 | ||||
| -rw-r--r-- | test/testsuite-28.units/specifier-j-wants.service | 9 | ||||
| -rw-r--r-- | test/units/testsuite-28.service | 9 |
5 files changed, 27 insertions, 35 deletions
diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh index 934e1bc70c..477eb15cbe 100755 --- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh +++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh @@ -15,42 +15,8 @@ test_setup() { setup_basic_environment mask_supporting_services - - # Set up the services. - cat >$initdir/etc/systemd/system/specifier-j-wants.service << EOF -[Unit] -Description=Wants with percent-j specifier -Wants=specifier-j-depends-%j.service -After=specifier-j-depends-%j.service - -[Service] -Type=oneshot -ExecStart=test -f /tmp/test-specifier-j-%j -ExecStart=/bin/sh -c 'echo OK > /testok' -EOF - cat >$initdir/etc/systemd/system/specifier-j-depends-wants.service << EOF -[Unit] -Description=Dependent service for percent-j specifier - -[Service] -Type=oneshot -ExecStart=touch /tmp/test-specifier-j-wants -EOF - cat >$initdir/etc/systemd/system/testsuite.service << EOF -[Unit] -Description=Testsuite: Ensure %j Wants directives work -Wants=specifier-j-wants.service -After=specifier-j-wants.service - -[Service] -Type=oneshot -ExecStart=/bin/true -EOF - - setup_testsuite ) - setup_nspawn_root } -do_test "$@" +do_test "$@" 28 diff --git a/test/meson.build b/test/meson.build index 6fea0fc93d..6b85854d20 100644 --- a/test/meson.build +++ b/test/meson.build @@ -22,6 +22,8 @@ install_subdir('testsuite-11.units', install_dir : testdata_dir) install_subdir('testsuite-16.units', install_dir : testdata_dir) +install_subdir('testsuite-28.units', + install_dir : testdata_dir) testsuite08_dir = testdata_dir + '/testsuite-08.units' install_data('testsuite-08.units/-.mount', diff --git a/test/testsuite-28.units/specifier-j-depends-wants.service b/test/testsuite-28.units/specifier-j-depends-wants.service new file mode 100644 index 0000000000..1db4d855b9 --- /dev/null +++ b/test/testsuite-28.units/specifier-j-depends-wants.service @@ -0,0 +1,6 @@ +[Unit] +Description=Dependent service for percent-j specifier + +[Service] +Type=oneshot +ExecStart=touch /tmp/test-specifier-j-wants diff --git a/test/testsuite-28.units/specifier-j-wants.service b/test/testsuite-28.units/specifier-j-wants.service new file mode 100644 index 0000000000..10c35906bb --- /dev/null +++ b/test/testsuite-28.units/specifier-j-wants.service @@ -0,0 +1,9 @@ +[Unit] +Description=Wants with percent-j specifier +Wants=specifier-j-depends-%j.service +After=specifier-j-depends-%j.service + +[Service] +Type=oneshot +ExecStart=test -f /tmp/test-specifier-j-%j +ExecStart=sh -c 'echo OK > /testok' diff --git a/test/units/testsuite-28.service b/test/units/testsuite-28.service new file mode 100644 index 0000000000..c4be0c631c --- /dev/null +++ b/test/units/testsuite-28.service @@ -0,0 +1,9 @@ +[Unit] +Description=TEST-28-PERCENTJ-WANTEDBY +# Testsuite: Ensure %j Wants directives work +Wants=specifier-j-wants.service +After=specifier-j-wants.service + +[Service] +ExecStart=true +Type=oneshot |