From: Petr Menšík <pemensik@redhat.com>
Date: Thu, 22 Feb 2018 14:32:16 +0000 (+0100)
Subject: unit/unittest.sh is generated by configure. It will always be
X-Git-Tag: v9.13.0~143^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95cde3608aab9e1e4025d5a73fa2c602b3082ea1;p=thirdparty%2Fbind9.git

unit/unittest.sh is generated by configure. It will always be
 generated into builddir. If out-of-tree build is used, make unit
will always fail. Kyuafiles and testdata still have to be copied
manually into the builddir.
---

diff --git a/Makefile.in b/Makefile.in
index b2681edb75f..c6e14a4dfb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,7 @@
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
+top_builddir =  @top_builddir@
 
 VERSION=@BIND9_VERSION@
 
@@ -86,7 +87,8 @@ force-test: test-force
 test-force:
 	status=0; \
 	(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
-	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \
+	(test -f ${top_builddir}/unit/unittest.sh && \
+		$(SHELL) ${top_builddir}/unit/unittest.sh) || status=1; \
 	exit $$status
 
 README: README.md
@@ -102,6 +104,6 @@ OPTIONS: OPTIONS.md
 		${W3M} -dump -cols 75 -O ascii -T text/html > $@
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean::
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 8ac2f9a9132..eb90477137c 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -239,7 +239,7 @@ dstrandom_test@EXEEXT@: dstrandom_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 8a85312c7bd..b59e5968416 100644
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -43,7 +43,7 @@ resconf_test@EXEEXT@: resconf_test.@O@ ${CFGDEPLIBS} ${DNSDEPLIBS} ${IRSDEPLIBS}
 			resconf_test.@O@ ${LIBS}
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 7714d797479..b005bc926b2 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -159,7 +159,7 @@ time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
 			time_test.@O@ ${ISCLIBS} ${LIBS}
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index f0f0a6fab31..bece7896137 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -44,7 +44,7 @@ parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS
 		        ${ISCLIBS} ${LIBS}
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 8d3de55d2fa..977a4fde06e 100644
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -58,7 +58,7 @@ query_test@EXEEXT@: query_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDE
 				${ISCLIBS} ${LIBS}
 
 unit::
-	sh ${top_srcdir}/unit/unittest.sh
+	sh ${top_builddir}/unit/unittest.sh
 
 clean distclean::
 	rm -f ${TARGETS}