diff options
| -rw-r--r-- | src/test/test-execute.c | 2 | ||||
| -rw-r--r-- | test/meson.build | 1 | ||||
| -rw-r--r-- | test/test-execute/exec-standardinput-file-cat.service | 9 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c index b3f8cc8434..ff40e0dd43 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -756,6 +756,7 @@ static void test_exec_specifier(Manager *m) { static void test_exec_standardinput(Manager *m) { test(__func__, m, "exec-standardinput-data.service", 0, CLD_EXITED); test(__func__, m, "exec-standardinput-file.service", 0, CLD_EXITED); + test(__func__, m, "exec-standardinput-file-cat.service", 0, CLD_EXITED); } static void test_exec_standardoutput(Manager *m) { @@ -786,6 +787,7 @@ static int run_tests(UnitFileScope scope, const test_entry tests[], char **patte assert_se(tests); r = manager_new(scope, MANAGER_TEST_RUN_BASIC, &m); + m->default_std_output = EXEC_OUTPUT_NULL; /* don't rely on host journald */ if (manager_errno_skip_test(r)) return log_tests_skipped_errno(r, "manager_new"); assert_se(r >= 0); diff --git a/test/meson.build b/test/meson.build index 237b4db12c..856e4a434d 100644 --- a/test/meson.build +++ b/test/meson.build @@ -138,6 +138,7 @@ test_data_files = ''' test-execute/exec-specifier@.service test-execute/exec-standardinput-data.service test-execute/exec-standardinput-file.service + test-execute/exec-standardinput-file-cat.service test-execute/exec-standardoutput-file.service test-execute/exec-standardoutput-append.service test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service diff --git a/test/test-execute/exec-standardinput-file-cat.service b/test/test-execute/exec-standardinput-file-cat.service new file mode 100644 index 0000000000..a0c786c301 --- /dev/null +++ b/test/test-execute/exec-standardinput-file-cat.service @@ -0,0 +1,9 @@ +[Unit] +Description=Test for StandardInput=file: + +[Service] +ExecStart=cat +Type=oneshot +StandardInput=file:/etc/os-release +# We leave StandardOutput= unset here, to verify https://github.com/systemd/systemd/issues/14560 works +# The "cat" tool is going to write to stdout, which fails if we dup() stdin to stdout |