checkpoint (fixed unit test make)

diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
index c07c504a943a38a930d8aad0956d684dc93be4ce..74fcc883677c1be071778e8d739b1d4638420261 100644 (file)
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -34,7 +34,8 @@ duid_unittests_LDADD = $(ATF_LDFLAGS)
 duid_unittests_LDADD += $(DHCPLIBS)
 
 check: $(ATF_TESTS)
-       sh ${top_srcdir}/tests/unittest.sh
+       cp -n $(top_srcdir)/client/tests/Atffile Atffile
+       sh ${top_builddir}/tests/unittest.sh
 
 endif
 

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 34748feadba1bed57ac2897484f32cf8d8f40da7..0156e5d7f26258d4d95c059dcd05a66cad743f93 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -37,7 +37,8 @@ ns_name_unittest_LDADD += ../libdhcp.a  \
        $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
 
 check: $(ATF_TESTS)
-       sh ${top_srcdir}/tests/unittest.sh
+       cp -n $(top_srcdir)/common/tests/Atffile Atffile
+       sh ${top_builddir}/tests/unittest.sh
 
 endif
 

diff --git a/configure.ac b/configure.ac
index 0dbd75f83cf6a2aaf6105c1365ecb1480f98bd75..9391d7d0085cc7e34cc120550c49b2a149fd3a07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ if test "$atf_path" = "bind" ; then
     atf_path="\${top_srcdir}/bind/atf"
     ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST"
     ATF_LDFLAGS="-L$atf_path/lib -latf-c"
-    ATF_BIN=`pwd`/bind/atf/bin
+    ATF_BIN=`cd $srcdir; pwd`/bind/atf/bin
     AC_SUBST(ATF_CFLAGS)
     AC_SUBST(ATF_LDFLAGS)
     AC_SUBST(ATF_BIN)

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 1d176af074433a925cc2bfb2a84d763a2d379400..1108e0a2c90e8d606bad1bdf73d49106216bb926 100644 (file)
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -48,7 +48,8 @@ load_bal_unittests_SOURCES = $(DHCPSRC) load_bal_unittest.c
 load_bal_unittests_LDADD = $(DHCPLIBS) $(ATF_LDFLAGS)
 
 check: $(ATF_TESTS)
-       sh ${top_srcdir}/tests/unittest.sh
+       cp -n $(top_srcdir)/server/tests/Atffile Atffile
+       sh ${top_builddir}/tests/unittest.sh
 
 endif