#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include "install.h"
#include "install-printf.h"
#include "hashmap.h"
#include "load-fragment.h"
#include "strv.h"
+#include "fileio.h"
+#include "test-helper.h"
-static void test_unit_file_get_set(void) {
+static int test_unit_file_get_set(void) {
int r;
Hashmap *h;
Iterator i;
UnitFileList *p;
- h = hashmap_new(string_hash_func, string_compare_func);
- assert(h);
+ h = hashmap_new(&string_hash_ops);
+ assert_se(h);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
- log_info("unit_file_get_list: %s", strerror(-r));
- assert(r >= 0);
+
+ if (r == -EPERM || r == -EACCES) {
+ printf("Skipping test: unit_file_get_list: %s", strerror(-r));
+ return EXIT_TEST_SKIP;
+ }
+
+ log_full(r == 0 ? LOG_INFO : LOG_ERR,
+ "unit_file_get_list: %s", strerror(-r));
+ if (r < 0)
+ return EXIT_FAILURE;
HASHMAP_FOREACH(p, h, i)
printf("%s = %s\n", p->path, unit_file_state_to_string(p->state));
unit_file_list_free(h);
+
+ return 0;
}
static void check_execcommand(ExecCommand *c,
/* const char *filename, */
/* unsigned line, */
/* const char *section, */
+ /* unsigned section_line, */
/* const char *lvalue, */
/* int ltype, */
/* const char *rvalue, */
ExecCommand *c = NULL, *c1;
/* basic test */
- r = config_parse_exec("fake", 1, "section",
+ r = config_parse_exec(NULL, "fake", 1, "section", 1,
"LValue", 0, "/RValue r1",
&c, NULL);
assert_se(r >= 0);
check_execcommand(c, "/RValue", "/RValue", "r1", false);
- r = config_parse_exec("fake", 2, "section",
+ r = config_parse_exec(NULL, "fake", 2, "section", 1,
"LValue", 0, "/RValue///slashes/// r1",
&c, NULL);
/* test slashes */
"r1", false);
/* honour_argv0 */
- r = config_parse_exec("fake", 3, "section",
+ r = config_parse_exec(NULL, "fake", 3, "section", 1,
"LValue", 0, "@/RValue///slashes2/// argv0 r1",
&c, NULL);
assert_se(r >= 0);
check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", false);
/* ignore && honour_argv0 */
- r = config_parse_exec("fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section", 1,
"LValue", 0, "-@/RValue///slashes3/// argv0a r1",
&c, NULL);
assert_se(r >= 0);
"/RValue/slashes3", "argv0a", "r1", true);
/* ignore && honour_argv0 */
- r = config_parse_exec("fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section", 1,
"LValue", 0, "@-/RValue///slashes4/// argv0b r1",
&c, NULL);
assert_se(r >= 0);
"/RValue/slashes4", "argv0b", "r1", true);
/* ignore && ignore */
- r = config_parse_exec("fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section", 1,
"LValue", 0, "--/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* ignore && ignore */
- r = config_parse_exec("fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section", 1,
"LValue", 0, "-@-/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* semicolon */
- r = config_parse_exec("fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section", 1,
"LValue", 0,
"-@/RValue argv0 r1 ; "
"/goo/goo boo",
"/goo/goo", "/goo/goo", "boo", false);
/* trailing semicolon */
- r = config_parse_exec("fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section", 1,
"LValue", 0,
"-@/RValue argv0 r1 ; ",
&c, NULL);
assert_se(c1->command_next == NULL);
/* escaped semicolon */
- r = config_parse_exec("fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section", 1,
"LValue", 0,
"/usr/bin/find \\;",
&c, NULL);
exec_command_free_list(c);
}
-#define env_file_1 \
- "a\n" \
- "b\\\n" \
- "c\n" \
- "d\\\n" \
- "e\\\n" \
- "f\n" \
- "g\\ \n" \
- "h\n" \
- "i\\"
+#define env_file_1 \
+ "a=a\n" \
+ "b=b\\\n" \
+ "c\n" \
+ "d=d\\\n" \
+ "e\\\n" \
+ "f\n" \
+ "g=g\\ \n" \
+ "h=h\n" \
+ "i=i\\"
+
+#define env_file_2 \
+ "a=a\\\n"
+
+#define env_file_3 \
+ "#SPAMD_ARGS=\"-d --socketpath=/var/lib/bulwark/spamd \\\n" \
+ "#--nouser-config \\\n" \
+ "normal=line"
+
+#define env_file_4 \
+ "# Generated\n" \
+ "\n" \
+ "HWMON_MODULES=\"coretemp f71882fg\"\n" \
+ "\n" \
+ "# For compatibility reasons\n" \
+ "\n" \
+ "MODULE_0=coretemp\n" \
+ "MODULE_1=f71882fg"
-#define env_file_2 \
- "a\\\n"
static void test_load_env_file_1(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
- assert(fd >= 0);
+ _cleanup_close_ int fd;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
- r = load_env_file(name, &data);
- assert(r == 0);
- assert(streq(data[0], "a"));
- assert(streq(data[1], "bc"));
- assert(streq(data[2], "def"));
- assert(streq(data[3], "g\\"));
- assert(streq(data[4], "h"));
- assert(streq(data[5], "i\\"));
- assert(data[6] == NULL);
+ r = load_env_file(NULL, name, NULL, &data);
+ assert_se(r == 0);
+ assert_se(streq(data[0], "a=a"));
+ assert_se(streq(data[1], "b=bc"));
+ assert_se(streq(data[2], "d=def"));
+ assert_se(streq(data[3], "g=g "));
+ assert_se(streq(data[4], "h=h"));
+ assert_se(streq(data[5], "i=i"));
+ assert_se(data[6] == NULL);
unlink(name);
}
static void test_load_env_file_2(void) {
- char _cleanup_strv_free_ **data = NULL;
+ _cleanup_strv_free_ char **data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
- int _cleanup_close_ fd = mkstemp(name);
- assert(fd >= 0);
+ _cleanup_close_ int fd;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
- r = load_env_file(name, &data);
- assert(r == 0);
- assert(streq(data[0], "a"));
- assert(data[1] == NULL);
+ r = load_env_file(NULL, name, NULL, &data);
+ assert_se(r == 0);
+ assert_se(streq(data[0], "a=a"));
+ assert_se(data[1] == NULL);
+ unlink(name);
+}
+
+static void test_load_env_file_3(void) {
+ _cleanup_strv_free_ char **data = NULL;
+ int r;
+
+ char name[] = "/tmp/test-load-env-file.XXXXXX";
+ _cleanup_close_ int fd;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
+ assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
+
+ r = load_env_file(NULL, name, NULL, &data);
+ assert_se(r == 0);
+ assert_se(data == NULL);
+ unlink(name);
+}
+
+static void test_load_env_file_4(void) {
+ _cleanup_strv_free_ char **data = NULL;
+ char name[] = "/tmp/test-load-env-file.XXXXXX";
+ _cleanup_close_ int fd;
+ int r;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
+ assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
+
+ r = load_env_file(NULL, name, NULL, &data);
+ assert_se(r == 0);
+ assert_se(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
+ assert_se(streq(data[1], "MODULE_0=coretemp"));
+ assert_se(streq(data[2], "MODULE_1=f71882fg"));
+ assert_se(data[3] == NULL);
unlink(name);
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
static void test_install_printf(void) {
char name[] = "name.service",
- path[] = "/run/systemd/systemd/name.service",
+ path[] = "/run/systemd/system/name.service",
user[] = "xxxx-no-such-user";
InstallInfo i = {name, path, user};
InstallInfo i2 = {name, path, NULL};
char name3[] = "name@inst.service",
- path3[] = "/run/systemd/systemd/name.service";
+ path3[] = "/run/systemd/system/name.service";
InstallInfo i3 = {name3, path3, user};
InstallInfo i4 = {name3, path3, NULL};
- char _cleanup_free_ *mid, *bid, *host;
+ _cleanup_free_ char *mid, *bid, *host;
- assert_se((mid = specifier_machine_id('m', NULL, NULL)));
- assert_se((bid = specifier_boot_id('b', NULL, NULL)));
+ assert_se(specifier_machine_id('m', NULL, NULL, &mid) >= 0 && mid);
+ assert_se(specifier_boot_id('b', NULL, NULL, &bid) >= 0 && bid);
assert_se((host = gethostname_malloc()));
#define expect(src, pattern, result) \
- { \
- char _cleanup_free_ *t = install_full_printf(&src, pattern); \
- char _cleanup_free_ \
+ do { \
+ _cleanup_free_ char *t = NULL; \
+ _cleanup_free_ char \
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \
+ assert_se(install_full_printf(&src, pattern, &t) >= 0 || !result); \
memzero(i.name, strlen(i.name)); \
memzero(i.path, strlen(i.path)); \
memzero(i.user, strlen(i.user)); \
- assert(d1 && d2 && d3); \
+ assert_se(d1 && d2 && d3); \
if (result) { \
printf("%s\n", t); \
- assert(streq(t, result)); \
- } else assert(t == NULL); \
+ assert_se(streq(t, result)); \
+ } else assert_se(t == NULL); \
strcpy(i.name, d1); \
strcpy(i.path, d2); \
strcpy(i.user, d3); \
- }
+ } while(false)
assert_se(setenv("USER", "root", 1) == 0);
expect(i, "%p", "name");
expect(i, "%i", "");
expect(i, "%u", "xxxx-no-such-user");
+
+ DISABLE_WARNING_NONNULL;
expect(i, "%U", NULL);
+ REENABLE_WARNING;
+
expect(i, "%m", mid);
expect(i, "%b", bid);
expect(i, "%H", host);
expect(i3, "%N", "name@inst");
expect(i3, "%p", "name");
expect(i3, "%u", "xxxx-no-such-user");
+
+ DISABLE_WARNING_NONNULL;
expect(i3, "%U", NULL);
+ REENABLE_WARNING;
+
expect(i3, "%m", mid);
expect(i3, "%b", bid);
expect(i3, "%H", host);
expect(i4, "%u", "root");
expect(i4, "%U", "0");
}
-#pragma GCC diagnostic pop
int main(int argc, char *argv[]) {
+ int r;
- test_unit_file_get_set();
+ log_parse_environment();
+ log_open();
+
+ r = test_unit_file_get_set();
test_config_parse_exec();
test_load_env_file_1();
test_load_env_file_2();
- test_install_printf();
+ test_load_env_file_3();
+ test_load_env_file_4();
+ TEST_REQ_RUNNING_SYSTEMD(test_install_printf());
- return 0;
+ return r;
}