chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
journal
/
test-journal-verify.c
diff --git
a/src/journal/test-journal-verify.c
b/src/journal/test-journal-verify.c
index 6b7414a4b1bff8ba0a10e6f580492a1010a694bb..9da120c0bb0add35639c30feb47668ef4ddfd8ff 100644
(file)
--- a/
src/journal/test-journal-verify.c
+++ b/
src/journal/test-journal-verify.c
@@
-38,17
+38,17
@@
static void bit_toggle(const char *fn, uint64_t p) {
int fd;
fd = open(fn, O_RDWR|O_CLOEXEC);
int fd;
fd = open(fn, O_RDWR|O_CLOEXEC);
- assert(fd >= 0);
+ assert
_se
(fd >= 0);
r = pread(fd, &b, 1, p/8);
r = pread(fd, &b, 1, p/8);
- assert(r == 1);
+ assert
_se
(r == 1);
b ^= 1 << (p % 8);
r = pwrite(fd, &b, 1, p/8);
b ^= 1 << (p % 8);
r = pwrite(fd, &b, 1, p/8);
- assert(r == 1);
+ assert
_se
(r == 1);
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
}
static int raw_verify(const char *fn, const char *verification_key) {
}
static int raw_verify(const char *fn, const char *verification_key) {
@@
-77,6
+77,10
@@
int main(int argc, char *argv[]) {
struct stat st;
uint64_t p;
struct stat st;
uint64_t p;
+ /* journal_file_open requires a valid machine id */
+ if (access("/etc/machine-id", F_OK) != 0)
+ return EXIT_TEST_SKIP;
+
log_set_max_level(LOG_DEBUG);
assert_se(mkdtemp(t));
log_set_max_level(LOG_DEBUG);
assert_se(mkdtemp(t));