dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

test-exec-util: add two test cases for scripts masked with empty file

Browse Source 
A test for #6831. Fails without the previous commit.

Suggested by Evgeny Vereshchagin.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-09-17 15:17:50 +02:00
parent 6a4643517b
commit f66137fb67
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/test-exec-util.c
View File

@@ -71,10 +71,14 @@ static const gather_stdout_callback_t ignore_stdout[] = {
};
static void test_execute_directory(bool gather_stdout) {
char template_lo[] = "/tmp/test-exec-util.XXXXXXX";
char template_hi[] = "/tmp/test-exec-util.XXXXXXX";
char template_lo[] = "/tmp/test-exec-util.lo.XXXXXXX";
char template_hi[] = "/tmp/test-exec-util.hi.XXXXXXX";
const char * dirs[] = {template_hi, template_lo, NULL};
const char *name, *name2, *name3, *overridden, *override, *masked, *mask;
const char *name, *name2, *name3,
*overridden, *override,
*masked, *mask,
*masked2, *mask2, /* the mask is non-executable */
*masked2e, *mask2e; /* the mask is executable */
log_info("/* %s (%s) */", __func__, gather_stdout ? "gathering stdout" : "asynchronous");
@@ -88,6 +92,10 @@ static void test_execute_directory(bool gather_stdout) {
override = strjoina(template_hi, "/overridden");
masked = strjoina(template_lo, "/masked");
mask = strjoina(template_hi, "/masked");
masked2 = strjoina(template_lo, "/masked2");
mask2 = strjoina(template_hi, "/masked2");
masked2e = strjoina(template_lo, "/masked2e");
mask2e = strjoina(template_hi, "/masked2e");
assert_se(write_string_file(name,
"#!/bin/sh\necho 'Executing '$0\ntouch $(dirname $0)/it_works",
@@ -104,7 +112,15 @@ static void test_execute_directory(bool gather_stdout) {
assert_se(write_string_file(masked,
"#!/bin/sh\necho 'Executing '$0\ntouch $(dirname $0)/failed",
WRITE_STRING_FILE_CREATE) == 0);
assert_se(write_string_file(masked2,
"#!/bin/sh\necho 'Executing '$0\ntouch $(dirname $0)/failed",
WRITE_STRING_FILE_CREATE) == 0);
assert_se(write_string_file(masked2e,
"#!/bin/sh\necho 'Executing '$0\ntouch $(dirname $0)/failed",
WRITE_STRING_FILE_CREATE) == 0);
assert_se(symlink("/dev/null", mask) == 0);
assert_se(touch(mask2) == 0);
assert_se(touch(mask2e) == 0);
assert_se(touch(name3) >= 0);
assert_se(chmod(name, 0755) == 0);
@@ -112,6 +128,9 @@ static void test_execute_directory(bool gather_stdout) {
assert_se(chmod(overridden, 0755) == 0);
assert_se(chmod(override, 0755) == 0);
assert_se(chmod(masked, 0755) == 0);
assert_se(chmod(masked2, 0755) == 0);
assert_se(chmod(masked2e, 0755) == 0);
assert_se(chmod(mask2e, 0755) == 0);
if (gather_stdout)
execute_directories(dirs, DEFAULT_TIMEOUT_USEC, ignore_stdout, ignore_stdout_args, NULL);