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.

(cherry picked from commit 95cde3608aab9e1e4025d5a73fa2c602b3082ea1)
(cherry picked from commit 6d9b38e9fe7608e61c5e1daf6edf99a227e5af8f)

diff --git a/Makefile.in b/Makefile.in
index 95adedd98cd3934644bd216bd7b3d5e0c6f8d756..8d0081d3c1f40cd537b075b1177dc28cc8a8b1fd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
+top_builddir =  @top_builddir@
 
 VERSION=@BIND9_VERSION@
 
@@ -95,7 +96,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
@@ -111,6 +113,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 b12ddbdc121e1f882677cbe0f540d8f4ef7241b8..a355266d4ed2afb2f6963f310bc2fade723f9952 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -12,8 +12,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -228,7 +226,7 @@ tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
                        ${ISCLIBS} ${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 93e8437ec841f709d22b3e9775147942fae178e8..535b747b46b31473770333fbf42170a478d383d5 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -12,8 +12,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -53,7 +51,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 ad279ae020874d4ce7a2f740d7b7187122383da7..3e8d105344e9294a90918fc747369e165b5612a6 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -143,7 +143,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}