From: Francis Dupont <fdupont@isc.org>
Date: Fri, 17 Apr 2015 15:26:20 +0000 (+0200)
Subject: checkpoint (fixed unit test make)
X-Git-Tag: v4_3_4~23^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abea88437744960cebf6878b4e098cf820066049;p=thirdparty%2Fdhcp.git

checkpoint (fixed unit test make)
---

diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
index c07c504a9..74fcc8836 100644
--- 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 34748fead..0156e5d7f 100644
--- 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 0dbd75f83..9391d7d00 100644
--- 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 1d176af07..1108e0a2c 100644
--- 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