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 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 8ac2f9a91324a359886d151cd6b5c1f46c37502b..eb90477137c5bfdf79a81fad6e8383e7499ba12e 100644 (file)
--- 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 8a85312c7bd104302f58f6550077bbb8cf3283cb..b59e5968416fee0d0af5ff8a795204b26581e162 100644 (file)
--- 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 7714d79747938b759b27c174b6de71ce690d9bb1..b005bc926b247a2aa458f0992027ff6e84694949 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 f0f0a6fab314f0204eec454d0e1ea3705bf1e5d5..bece7896137e0cbecb91a3a33be5578827a885f7 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}

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 8d3de55d2fadc863ce41f121b36399a27241d896..977a4fde06e5d473b7c880ee14a9a2ef5962aa2c 100644 (file)
--- 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}