[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libvir] [PATCH] Fix bugs in tests/Makefile.am.



I added a new test (coming in next message), but it failed
due to problems fixed here:

	Fix bugs in tests/Makefile.am.
	* tests/Makefile.am (abs_top_builddir): Correct invalid
	settings of abs_top_builddir and abs_top_srcdir.
	Also prepend src/ to PATH, so we test the just-built virsh,
	not whatever happens to be in the original $PATH.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 644715e..4810179 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,13 +53,15 @@ if ENABLE_XEN_TESTS
   TESTS += reconnect
 endif

+path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
+
 # NB, automake < 1.10 does not provide the real
 # abs_top_{src/build}dir variables, so don't rely
 # on them here. Fake them with 'pwd'
 TESTS_ENVIRONMENT =				\
-  abs_top_builddir=`pwd`/'$(top_builddir)'	\
-  abs_top_srcdir=`pwd`/'$(top_srcdir)'		\
-  PATH="$$abs_top_builddir/qemud$(PATH_SEPARATOR)$$PATH" \
+  abs_top_builddir=`cd '$(top_builddir)'; pwd`	\
+  abs_top_srcdir=`cd '$(top_srcdir)'; pwd`	\
+  PATH="$(path_add)$(PATH_SEPARATOR)$$PATH"	\
   $(VG)

 valgrind:
--
1.5.4.4.482.g16f99


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]