diff options
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 2 | ||||
| -rw-r--r-- | src/test/test-cgroup-mask.c | 3 | ||||
| -rw-r--r-- | src/test/test-sched-prio.c | 3 |
4 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index c13956dc9d..19da6eab95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1349,10 +1349,9 @@ test_cgroup_LDADD = \ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c -test_cgroup_mask_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_cgroup_mask_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_cgroup_mask_LDADD = \ libsystemd-core.la \ @@ -1416,9 +1415,9 @@ test_watchdog_LDADD = \ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c -test_sched_prio_CFLAGS = \ - $(AM_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_sched_prio_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_sched_prio_LDADD = \ libsystemd-core.la \ @@ -3058,8 +3057,8 @@ test_mmap_cache_LDADD = \ test_catalog_SOURCES = \ src/journal/test-catalog.c -test_catalog_CFLAGS = \ - $(AM_CFLAGS) \ +test_catalog_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\" test_catalog_LDADD = \ @@ -3317,9 +3316,12 @@ systemd_journal_gatewayd_LDADD = \ systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ - -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \ $(MICROHTTPD_CFLAGS) +systemd_journal_gatewayd_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" + dist_systemunit_DATA += \ units/systemd-journal-gatewayd.socket diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 3cbafa4d51..017c35dcd6 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -24,7 +24,7 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <sys/statfs.h> -#include <blkid.h> +#include <blkid/blkid.h> #ifdef HAVE_LINUX_BTRFS_H #include <linux/btrfs.h> diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 0f145d6bc4..99c8ceea76 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -37,9 +37,10 @@ static int test_cgroup_mask(void) { FILE *serial = NULL; FDSet *fdset = NULL; int r; + const char *dir = TEST_DIR; /* Prepare the manager. */ - assert_se(set_unit_path(TEST_DIR) >= 0); + assert_se(set_unit_path(dir) >= 0); r = manager_new(SYSTEMD_USER, &m); if (r == -EPERM || r == -EACCES) { puts("manager_new: Permission denied. Skipping test."); diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 56e11f8daf..a4cc3d44a2 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -31,9 +31,10 @@ int main(int argc, char *argv[]) { FILE *serial = NULL; FDSet *fdset = NULL; int r; + const char *dir = TEST_DIR; /* prepare the test */ - assert_se(set_unit_path(TEST_DIR) >= 0); + assert_se(set_unit_path(dir) >= 0); r = manager_new(SYSTEMD_USER, &m); if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) { printf("Skipping test: manager_new: %s", strerror(-r)); |