chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: optimize bisection logic a bit by caching the last position
[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 aba36e4df1ad072e75e200757d396d051decfa9f..bde643ad56a249a4c1278be78acf86cfa66c0236 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); \
@@
-113,18
+114,18
@@
static int test_unit_printf(void) {
Unit *u, *u2;
int r;
Unit *u, *u2;
int r;
-
char _cleanup_free_
*mid, *bid, *host, *root_uid;
+
_cleanup_free_ char
*mid, *bid, *host, *root_uid;
struct passwd *root;
struct passwd *root;
- 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()));
assert_se((root = getpwnam("root")));
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
assert_se((host = gethostname_malloc()));
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 || r == -EADDRINUSE
) {
puts("manager_new: Permission denied. Skipping test.");
return EXIT_TEST_SKIP;
}
puts("manager_new: Permission denied. Skipping test.");
return EXIT_TEST_SKIP;
}
@@
-133,8
+134,8
@@
static int test_unit_printf(void) {
#define expect(unit, pattern, expected) \
{ \
char *e; \
#define expect(unit, pattern, expected) \
{ \
char *e; \
-
char _cleanup_free_ *t =
\
-
unit_full_printf(unit, pattern);
\
+
_cleanup_free_ char *t;
\
+
assert_se(unit_full_printf(unit, pattern, &t) >= 0);
\
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
assert(strncmp(t, e, e-expected)); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
assert(strncmp(t, e, e-expected)); \
@@
-190,10
+191,14
@@
static int test_unit_printf(void) {
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
+ manager_free(m);
+
return 0;
}
int main(int argc, char* argv[]) {
return 0;
}
int main(int argc, char* argv[]) {
+ int rc = 0;
test_replacements();
test_replacements();
- return test_unit_printf();
+ TEST_REQ_RUNNING_SYSTEMD(rc = test_unit_printf());
+ return rc;
}
}