diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-01-11 15:02:35 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2018-01-11 15:02:35 +0100 |
| commit | 662483908c023cce58066d2b8169a5c20ce25eb4 (patch) | |
| tree | e10d3a6e7f36e51e6950421ad556ad3b636b2b93 /server | |
| parent | 7932503f703acdb6b3d7a60ff621f223a89426a9 (diff) | |
| parent | e985472adfc7ee3034e29eebdea0d4daf2afad66 (diff) | |
| download | isc-dhcp-662483908c023cce58066d2b8169a5c20ce25eb4.tar.gz | |
Finishing merge of rt46933 (Kyua)
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.in | 1 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | server/tests/Makefile.in | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/server/Makefile.in b/server/Makefile.in index d585d08d..08e2774a 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -324,6 +324,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UNITTESTS = @UNITTESTS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 4db492bf..699a0b68 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) AM_CPPFLAGS += -DLOCALSTATEDIR='"."' -EXTRA_DIST = Atffile +EXTRA_DIST = Atffile Kyuafile # for autotools debugging only info: @@ -54,12 +54,13 @@ leaseq_unittests_LDADD = $(DHCPLIBS) $(ATF_LDFLAGS) check: $(ATF_TESTS) @if test $(top_srcdir) != ${top_builddir}; then \ cp $(top_srcdir)/server/tests/Atffile Atffile; \ + cp $(top_srcdir)/server/tests/Kyuafile Kyuafile; \ fi sh ${top_builddir}/tests/unittest.sh distclean-local: @if test $(top_srcdir) != ${top_builddir}; then \ - rm -f Atffile; \ + rm -f Atffile Kyuafile; \ fi endif diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in index 4fdfed14..bc1c00b3 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -340,6 +340,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UNITTESTS = @UNITTESTS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -397,7 +398,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = . AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ -I@BINDDIR@/include -I$(top_srcdir) -DLOCALSTATEDIR='"."' -EXTRA_DIST = Atffile +EXTRA_DIST = Atffile Kyuafile DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ ../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \ ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ @@ -1064,12 +1065,13 @@ info: @HAVE_ATF_TRUE@check: $(ATF_TESTS) @HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/server/tests/Atffile Atffile; \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/server/tests/Kyuafile Kyuafile; \ @HAVE_ATF_TRUE@ fi @HAVE_ATF_TRUE@ sh ${top_builddir}/tests/unittest.sh @HAVE_ATF_TRUE@distclean-local: @HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ -@HAVE_ATF_TRUE@ rm -f Atffile; \ +@HAVE_ATF_TRUE@ rm -f Atffile Kyuafile; \ @HAVE_ATF_TRUE@ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. |