summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-09-24 14:27:21 +0200
committerSven Eden <yamakuzure@gmx.net>2017-11-22 08:22:23 +0100
commit68bb1246bf0dc56f61b6d655694ddd4df647167c (patch)
treed3ec4ecc37c903334f496981f12ead2973836c2f /src/test
parente0e02387f7dfc8ab4f415212264666476fc4a21f (diff)
fileio: return 0 from read_one_line_file on success
Fixup for f4b51a2d09. Suggested by Evgeny Vereshchagin.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/meson.build20
-rw-r--r--src/test/test-cgroup.c3
-rw-r--r--src/test/test-log.c3
-rw-r--r--src/test/test-signal-util.c3
4 files changed, 16 insertions, 13 deletions
diff --git a/src/test/meson.build b/src/test/meson.build
index 6059c2efd..c811dd675 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -365,16 +365,16 @@ tests += [
[libbasic],
[]],
- [['src/test/test-bpf.c',
- 'src/test/test-helper.c'],
- [libcore,
- libshared],
- [libmount,
- threads,
- librt,
- libseccomp,
- libselinux,
- libblkid]],
+# [['src/test/test-bpf.c',
+# 'src/test/test-helper.c'],
+# [libcore,
+# libshared],
+# [libmount,
+# threads,
+# librt,
+# libseccomp,
+# libselinux,
+# libblkid]],
[['src/test/test-hashmap.c',
'src/test/test-hashmap-plain.c',
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 2ed91c780..509946250 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -22,9 +22,10 @@
#include "cgroup-util.h"
#include "path-util.h"
-#include "process-util.h"
#include "string-util.h"
#include "util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
int main(int argc, char*argv[]) {
char *path;
diff --git a/src/test/test-log.c b/src/test/test-log.c
index ec1bc2a63..2417b3aef 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -22,8 +22,9 @@
#include "format-util.h"
#include "log.h"
-#include "process-util.h"
#include "util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
assert_cc(LOG_REALM_REMOVE_LEVEL(LOG_REALM_PLUS_LEVEL(LOG_REALM_SYSTEMD, LOG_FTP | LOG_DEBUG))
== LOG_REALM_SYSTEMD);
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 1830396ac..0db8a1e32 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -21,8 +21,9 @@
#include <unistd.h>
#include "macro.h"
-#include "process-util.h"
#include "signal-util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
static void test_block_signals(void) {
sigset_t ss;