From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 6 Dec 2016 21:55:43 +0000 (+0100)
Subject: build-sys: include the builddir in $PATH while testing
X-Git-Tag: v233~311^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b12360bf6ec13f52a9d6161e1e14b5ca901300c;p=thirdparty%2Fsystemd.git

build-sys: include the builddir in $PATH while testing

udev-test.pl shells out systemd-detect-virt, and it really should invoke the
version from the build tree instead of one supplied by the installed system,
hence let's add the builddir to $PATH while building.
---

diff --git a/Makefile.am b/Makefile.am
index 8f7b83f0ab7..d75807a9f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,8 @@ TESTS =
 endif
 AM_TESTS_ENVIRONMENT = \
 	export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \
-	export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map;
+	export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map; \
+	export PATH=$(abs_top_builddir):$$PATH;
 
 if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA = $(dist_bashcompletion_data)