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 95cde3608a)
This commit is contained in:
Petr Menšík
2018-02-22 15:32:16 +01:00
committed by Evan Hunt
parent 2505871105
commit eb5c7e91fa
6 changed files with 9 additions and 7 deletions

View File

@@ -10,6 +10,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
VERSION=@BIND9_VERSION@
@@ -89,7 +90,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
@@ -105,6 +107,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::

View File

@@ -242,7 +242,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}

View File

@@ -46,7 +46,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}

View File

@@ -162,7 +162,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}

View File

@@ -47,7 +47,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}

View File

@@ -61,7 +61,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}