diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-28 20:17:24 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-28 23:45:59 -0400 |
| commit | 844ec79b3c2f246114ea316ebe1f36044bdb688e (patch) | |
| tree | 6e937c3738ee75fdd2c22e5f9bec72d789d6e13b /Makefile.am | |
| parent | 18cd5fe99f70a55a2d6f2303d6ee0624942695b1 (diff) | |
catalog: open up catalog internals
In order to write tests for the catalog functions, they
are made non-static and start taking a 'database' parameter,
which is the name of a file with the preprocessed catalog
entries.
This makes it possible to make test-catalog part of the
normal test suite, since it now only operates on files
in /tmp.
Some more tests are added.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 923f81bb20..2eae8773fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,7 +138,7 @@ AM_CPPFLAGS = \ -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ - -DCATALOG_PATH=\"$(catalogstatedir)\" \ + -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ @@ -2748,8 +2748,7 @@ UNINSTALL_DATA_HOOKS += \ catalog-remove-hook noinst_PROGRAMS += \ - test-journal-enum \ - test-catalog + test-journal-enum noinst_tests += \ test-journal \ @@ -2758,7 +2757,8 @@ noinst_tests += \ test-journal-match \ test-journal-stream \ test-journal-verify \ - test-mmap-cache + test-mmap-cache \ + test-catalog pkginclude_HEADERS += \ src/systemd/sd-journal.h \ |