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)

diff --git a/Makefile.in b/Makefile.in
index b2681edb75fd22031066e54ed85145b05ed1cd28..c6e14a4dfb9d23438db0e0e160f63b2ff64af0e4 100644 (file)
--- 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 c7fd4ed05c5b6e2a8d8c3153baec242aa6e5587f..339e19c4d499462c95363661d756dece38265f64 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -234,7 +232,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 2ecf8b03e5a071d26af82d00cd80880e6485ca56..00a808d56e734a5e75c5b4d2ebafc7e2800ec723 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -45,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 20c7e2513a5b8a8c0979b602aceb959b8538d301..f7fa538f833b88ab2992bc78a1882c4ece481976 100644 (file)
--- 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 be64b929650e49ae906f01342796781fc1ab2a2a..cbd444a7d1f5c4ba7614492282b8310490fe84c5 100644 (file)
--- 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}