chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume that /proc/meminfo can be missing
[elogind.git]
/
src
/
test
/
test-unit-name.c
diff --git
a/src/test/test-unit-name.c
b/src/test/test-unit-name.c
index 7bd99d31c83a72288480953e4da7e98f4ed711ff..c17692b845e5af80f469954acaf0baaec39b4ed5 100644
(file)
--- a/
src/test/test-unit-name.c
+++ b/
src/test/test-unit-name.c
@@
-34,11
+34,12
@@
#include "specifier.h"
#include "util.h"
#include "macro.h"
#include "specifier.h"
#include "util.h"
#include "macro.h"
+#include "test-helper.h"
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
@@
-57,7
+58,7
@@
static void test_replacements(void) {
#undef expect
#define expect(path, suffix, expected) \
{ \
#undef expect
#define expect(path, suffix, expected) \
{ \
-
char _cleanup_free_
*k, *t = \
+
_cleanup_free_ char
*k, *t = \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
@@
-75,7
+76,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
@@
-90,7
+91,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern) \
{ \
#undef expect
#define expect(pattern) \
{ \
-
char _cleanup_free_
*k, *t; \
+
_cleanup_free_ char
*k, *t; \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
@@
-108,12
+109,12
@@
static void test_replacements(void) {
#undef expect
}
#undef expect
}
-static
void
test_unit_printf(void) {
+static
int
test_unit_printf(void) {
Manager *m;
Unit *u, *u2;
int r;
Manager *m;
Unit *u, *u2;
int r;
-
char _cleanup_free_
*mid, *bid, *host, *root_uid;
+
_cleanup_free_ char
*mid, *bid, *host, *root_uid;
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
@@
-123,17
+124,17
@@
static void test_unit_printf(void) {
assert_se((root = getpwnam("root")));
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
assert_se((root = getpwnam("root")));
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
- r = manager_new(SYSTEMD_USER, &m);
- if (r == -EPERM) {
+ r = manager_new(SYSTEMD_USER,
false,
&m);
+ if (r == -EPERM
|| r == -EACCES
) {
puts("manager_new: Permission denied. Skipping test.");
puts("manager_new: Permission denied. Skipping test.");
- return;
+ return
EXIT_TEST_SKIP
;
}
assert(r == 0);
#define expect(unit, pattern, expected) \
{ \
char *e; \
}
assert(r == 0);
#define expect(unit, pattern, expected) \
{ \
char *e; \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_full_printf(unit, pattern); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
unit_full_printf(unit, pattern); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
@@
-164,7
+165,7
@@
static void test_unit_printf(void) {
expect(u, "%u", root->pw_name);
expect(u, "%U", root_uid);
expect(u, "%h", root->pw_dir);
expect(u, "%u", root->pw_name);
expect(u, "%U", root_uid);
expect(u, "%h", root->pw_dir);
- expect(u, "%s",
root->pw_shell
);
+ expect(u, "%s",
"/bin/sh"
);
expect(u, "%m", mid);
expect(u, "%b", bid);
expect(u, "%H", host);
expect(u, "%m", mid);
expect(u, "%b", bid);
expect(u, "%H", host);
@@
-184,16
+185,20
@@
static void test_unit_printf(void) {
expect(u2, "%u", root->pw_name);
expect(u2, "%U", root_uid);
expect(u2, "%h", root->pw_dir);
expect(u2, "%u", root->pw_name);
expect(u2, "%U", root_uid);
expect(u2, "%h", root->pw_dir);
- expect(u2, "%s",
root->pw_shell
);
+ expect(u2, "%s",
"/bin/sh"
);
expect(u2, "%m", mid);
expect(u2, "%b", bid);
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
expect(u2, "%m", mid);
expect(u2, "%b", bid);
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
+
+ manager_free(m);
+
+ return 0;
}
int main(int argc, char* argv[]) {
}
int main(int argc, char* argv[]) {
+ int rc = 0;
test_replacements();
test_replacements();
- test_unit_printf();
-
- return 0;
+ TEST_REQ_RUNNING_SYSTEMD(rc = test_unit_printf());
+ return rc;
}
}