]> git.ipfire.org Git - thirdparty/systemd.git/commit
test: use ${builddir}/systemd-runtest.env for $SYSTEMD_CATALOG_DIR
authorFilipe Brandenburger <filbranden@google.com>
Wed, 12 Sep 2018 07:23:40 +0000 (00:23 -0700)
committerFilipe Brandenburger <filbranden@google.com>
Wed, 12 Sep 2018 16:49:03 +0000 (09:49 -0700)
commit49cdae63d168b2fe0e19f9f090b90d79de3c39bb
tree9a5225262ab5e987d64fd81417fca50f17f47661
parente2d413707fc68ed033a83e10a055ca638a1e1e18
test: use ${builddir}/systemd-runtest.env for $SYSTEMD_CATALOG_DIR

This makes it so that tests no longer need to know the absolute paths to the
source and build dirs, instead using the systemd-runtest.env file to get these
paths when running from the build tree.

Confirmed that test-catalog works on `ninja test`, when called standalone and
also when the environment file is not present, in which case it will use the
installed location under /usr/lib/systemd/catalog.

The location can now also be overridden for this test by setting the
$SYSTEMD_CATALOG_DIR environment variable.
meson.build
src/journal/test-catalog.c
src/shared/tests.c
src/shared/tests.h
src/test/meson.build