ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'kyua-oot' into 'master'

Browse Source 
chg: dev: Unit tests were broken in out-of-tree builds.

See merge request isc-projects/bind9!57
This commit is contained in:
Evan Hunt
2018-02-23 18:22:59 -05:00
parent 971d19f05c 95cde3608a
commit 3c028ed07d
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@@ -10,6 +10,7 @@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
VERSION=@BIND9_VERSION@ VERSION=@BIND9_VERSION@
@@ -89,7 +90,8 @@ force-test: test-force
test-force: test-force:
status=0; \ status=0; \
(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \ (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 exit $$status
README: README.md README: README.md
@@ -105,6 +107,6 @@ OPTIONS: OPTIONS.md
${W3M} -dump -cols 75 -O ascii -T text/html > $@ ${W3M} -dump -cols 75 -O ascii -T text/html > $@
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean:: clean::

2
lib/dns/tests/Makefile.in
View File

@@ -242,7 +242,7 @@ dstrandom_test@EXEEXT@: dstrandom_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${ISCLIBS} ${ISCPK11LIBS} ${LIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean distclean:: clean distclean::
rm -f ${TARGETS} rm -f ${TARGETS}

2
lib/irs/tests/Makefile.in
View File

@@ -46,7 +46,7 @@ resconf_test@EXEEXT@: resconf_test.@O@ ${CFGDEPLIBS} ${DNSDEPLIBS} ${IRSDEPLIBS}
resconf_test.@O@ ${LIBS} resconf_test.@O@ ${LIBS}
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean distclean:: clean distclean::
rm -f ${TARGETS} rm -f ${TARGETS}

2
lib/isc/tests/Makefile.in
View File

@@ -162,7 +162,7 @@ time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
time_test.@O@ ${ISCLIBS} ${LIBS} time_test.@O@ ${ISCLIBS} ${LIBS}
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean distclean:: clean distclean::
rm -f ${TARGETS} rm -f ${TARGETS}

2
lib/isccfg/tests/Makefile.in
View File

@@ -47,7 +47,7 @@ parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS
${ISCLIBS} ${LIBS} ${ISCLIBS} ${LIBS}
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean distclean:: clean distclean::
rm -f ${TARGETS} rm -f ${TARGETS}

2
lib/ns/tests/Makefile.in
View File

@@ -61,7 +61,7 @@ query_test@EXEEXT@: query_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDE
${ISCLIBS} ${LIBS} ${ISCLIBS} ${LIBS}
unit:: unit::
sh ${top_srcdir}/unit/unittest.sh sh ${top_builddir}/unit/unittest.sh
clean distclean:: clean distclean::
rm -f ${TARGETS} rm -f ${TARGETS}