We already have code that defines all abs_* variables at the
top of tests/Makefile.am, so there is no point in redefining
them a second time (using a slightly different shell
incantation to boot).
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
tests/Makefile.am | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42ec64755d..858ed047e8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -469,20 +469,12 @@ endif ! WITH_TESTS
TESTS = $(test_programs) \
$(test_scripts)
-# NB, automake < 1.10 does not provide the real
-# abs_top_{src/build}dir or builddir variables, so don't rely
-# on them here. Fake them with 'pwd'
-# Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an
-# intermediate shell variable, but must do all the expansion in make
-
-lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd)
-
VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT)
TESTS_ENVIRONMENT = \
- abs_top_builddir=$(lv_abs_top_builddir) \
- abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
- abs_builddir=$(abs_builddir) \
- abs_srcdir=$(abs_srcdir) \
+ abs_top_builddir="$(abs_top_builddir)" \
+ abs_top_srcdir="$(abs_top_srcdir)" \
+ abs_builddir="$(abs_builddir)" \
+ abs_srcdir="$(abs_srcdir)" \
SHELL="$(SHELL)" \
LIBVIRT_AUTOSTART=0 \
LC_ALL=C \
--
2.20.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
