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 /common | |
| parent | 7932503f703acdb6b3d7a60ff621f223a89426a9 (diff) | |
| parent | e985472adfc7ee3034e29eebdea0d4daf2afad66 (diff) | |
| download | isc-dhcp-662483908c023cce58066d2b8169a5c20ce25eb4.tar.gz | |
Finishing merge of rt46933 (Kyua)
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.in | 1 | ||||
| -rw-r--r-- | common/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | common/tests/Makefile.in | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/common/Makefile.in b/common/Makefile.in index b8eafe77..630de997 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -315,6 +315,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/common/tests/Makefile.am b/common/tests/Makefile.am index 84e21591..4129e450 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = . AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes -EXTRA_DIST = Atffile +EXTRA_DIST = Atffile Kyuafile ATF_TESTS = @@ -45,12 +45,13 @@ ns_name_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ check: $(ATF_TESTS) @if test $(top_srcdir) != ${top_builddir}; then \ cp $(top_srcdir)/common/tests/Atffile Atffile; \ + cp $(top_srcdir)/common/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/common/tests/Makefile.in b/common/tests/Makefile.in index 3818764d..60b176f0 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -306,6 +306,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UNITTESTS = @UNITTESTS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -362,7 +363,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes -EXTRA_DIST = Atffile +EXTRA_DIST = Atffile Kyuafile ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@alloc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.@A@ \ @@ -767,12 +768,13 @@ uninstall-am: @HAVE_ATF_TRUE@check: $(ATF_TESTS) @HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/common/tests/Atffile Atffile; \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/common/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. |