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)
(cherry picked from commit 6f2fd5cccab25d8a498e39501002754cd24a4ec2)

diff --git a/Makefile.in b/Makefile.in
index b7bfc483cc618bed3862e9c2a844b773c5fcde3f..c098ef02e3cb1a0a341539dd20deccb2611b6ff0 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@
 
@@ -90,7 +91,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
@@ -106,6 +108,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 1c3597da07eeab29cb07ac1b0c2983bafd93ac0b..4b078a31fd8acc37fee313d2612a72714c2a3322 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@
@@ -177,7 +175,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 612949577dc2c4b5eb3b277506b540b2dd3d7bcd..10acb468046959222fa5ed23f0365aa9c7bdbeb3 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -136,7 +136,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}