chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp: message_init - only set secs in the client
[elogind.git]
/
src
/
journal
/
test-journal-interleaving.c
diff --git
a/src/journal/test-journal-interleaving.c
b/src/journal/test-journal-interleaving.c
index 069d297a9f77d7106218ad4d92b4b945fe5c609d..5c9604472e7f4dad54a6c73e6760548027e08b78 100644
(file)
--- a/
src/journal/test-journal-interleaving.c
+++ b/
src/journal/test-journal-interleaving.c
@@
-36,7
+36,7
@@
static bool arg_keep = false;
static bool arg_keep = false;
-static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
+
noreturn
static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
log_meta(LOG_CRIT, file, line, func,
"'%s' failed at %s:%u (%s): %s.",
text, file, line, func, strerror(eno));
log_meta(LOG_CRIT, file, line, func,
"'%s' failed at %s:%u (%s): %s.",
text, file, line, func, strerror(eno));
@@
-50,20
+50,17
@@
static void log_assert_errno(const char *text, int eno, const char *file, int li
log_assert_errno(#expr, -_r_, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
} while (false)
log_assert_errno(#expr, -_r_, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
} while (false)
-static JournalFile *test_open (const char *name)
-{
+static JournalFile *test_open(const char *name) {
JournalFile *f;
assert_ret(journal_file_open(name, O_RDWR|O_CREAT, 0644, true, false, NULL, NULL, NULL, &f));
return f;
}
JournalFile *f;
assert_ret(journal_file_open(name, O_RDWR|O_CREAT, 0644, true, false, NULL, NULL, NULL, &f));
return f;
}
-static void test_close (JournalFile *f)
-{
+static void test_close(JournalFile *f) {
journal_file_close (f);
}
journal_file_close (f);
}
-static void append_number(JournalFile *f, int n, uint64_t *seqnum)
-{
+static void append_number(JournalFile *f, int n, uint64_t *seqnum) {
char *p;
dual_timestamp ts;
struct iovec iovec[1];
char *p;
dual_timestamp ts;
struct iovec iovec[1];
@@
-74,13
+71,12
@@
static void append_number(JournalFile *f, int n, uint64_t *seqnum)
iovec[0].iov_base = p;
iovec[0].iov_len = strlen(p);
assert_ret(journal_file_append_entry(f, &ts, iovec, 1, seqnum, NULL, NULL));
iovec[0].iov_base = p;
iovec[0].iov_len = strlen(p);
assert_ret(journal_file_append_entry(f, &ts, iovec, 1, seqnum, NULL, NULL));
- free
(p);
+ free(p);
}
}
-static void test_check_number (sd_journal *j, int n)
-{
+static void test_check_number (sd_journal *j, int n) {
const void *d;
const void *d;
- char *k;
+
_cleanup_free_
char *k;
size_t l;
int x;
size_t l;
int x;
@@
-92,9
+88,10
@@
static void test_check_number (sd_journal *j, int n)
assert_se(n == x);
}
assert_se(n == x);
}
-static void test_check_numbers_down (sd_journal *j, int count)
-{
- for (int i = 1; i <= count; i++) {
+static void test_check_numbers_down (sd_journal *j, int count) {
+ int i;
+
+ for (i = 1; i <= count; i++) {
int r;
test_check_number(j, i);
assert_ret(r = sd_journal_next(j));
int r;
test_check_number(j, i);
assert_ret(r = sd_journal_next(j));
@@
-106,8
+103,7
@@
static void test_check_numbers_down (sd_journal *j, int count)
}
}
-static void test_check_numbers_up (sd_journal *j, int count)
-{
+static void test_check_numbers_up (sd_journal *j, int count) {
for (int i = count; i >= 1; i--) {
int r;
test_check_number(j, i);
for (int i = count; i >= 1; i--) {
int r;
test_check_number(j, i);
@@
-144,8
+140,7
@@
static void setup_interleaved(void) {
test_close(two);
}
test_close(two);
}
-static void test_skip(void (*setup)(void))
-{
+static void test_skip(void (*setup)(void)) {
char t[] = "/tmp/journal-skip-XXXXXX";
sd_journal *j;
int r;
char t[] = "/tmp/journal-skip-XXXXXX";
sd_journal *j;
int r;
@@
-194,7
+189,7
@@
static void test_skip(void (*setup)(void))
if (arg_keep)
log_info("Not removing %s", t);
else {
if (arg_keep)
log_info("Not removing %s", t);
else {
- journal_directory_vacuum(".", 3000000, 0,
0,
NULL);
+ journal_directory_vacuum(".", 3000000, 0, NULL);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
@@
-279,7
+274,7
@@
static void test_sequence_numbers(void) {
if (arg_keep)
log_info("Not removing %s", t);
else {
if (arg_keep)
log_info("Not removing %s", t);
else {
- journal_directory_vacuum(".", 3000000, 0,
0,
NULL);
+ journal_directory_vacuum(".", 3000000, 0, NULL);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
@@
-288,6
+283,10
@@
static void test_sequence_numbers(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
+ /* journal_file_open requires a valid machine id */
+ if (access("/etc/machine-id", F_OK) != 0)
+ return EXIT_TEST_SKIP;
+
arg_keep = argc > 1;
test_skip(setup_sequential);
arg_keep = argc > 1;
test_skip(setup_sequential);