Fix bugs in tests/Makefile.am.

* tests/Makefile.am (TESTS_ENVIRONMENT): 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.
This commit is contained in:
Jim Meyering 2008-03-24 10:18:36 +00:00
parent 979bb2bb67
commit 870dba07b1
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,11 @@
Mon Mar 24 11:16:58 CET 2008 Jim Meyering <meyering@redhat.com>
Fix bugs in tests/Makefile.am.
* tests/Makefile.am (TESTS_ENVIRONMENT): 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.
Mon Mar 24 10:20:21 CET 2008 Daniel Veillard <veillard@redhat.com> Mon Mar 24 10:20:21 CET 2008 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c: applied patch from Saori Fukuta adding the * src/xend_internal.c: applied patch from Saori Fukuta adding the

View File

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