diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-04-17 17:26:20 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-04-17 17:26:20 +0200 |
| commit | abea88437744960cebf6878b4e098cf820066049 (patch) | |
| tree | 5fc5d8e406005699edbbc3f0ffe7e3ec3e1eac80 | |
| parent | 28fc08f6586686151ab46ab998d3b69ed4d00260 (diff) | |
| download | isc-dhcp-abea88437744960cebf6878b4e098cf820066049.tar.gz | |
checkpoint (fixed unit test make)
| -rw-r--r-- | client/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | common/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am index c07c504a..74fcc883 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 34748fea..0156e5d7 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 0dbd75f8..9391d7d0 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 1d176af0..1108e0a2 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 |