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 /client | |
| parent | 7932503f703acdb6b3d7a60ff621f223a89426a9 (diff) | |
| parent | e985472adfc7ee3034e29eebdea0d4daf2afad66 (diff) | |
| download | isc-dhcp-662483908c023cce58066d2b8169a5c20ce25eb4.tar.gz | |
Finishing merge of rt46933 (Kyua)
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.in | 1 | ||||
| -rw-r--r-- | client/tests/Makefile.am | 7 | ||||
| -rw-r--r-- | client/tests/Makefile.in | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/client/Makefile.in b/client/Makefile.in index 8ec43f0d..a016bbe9 100644 --- a/client/Makefile.in +++ b/client/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@ diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am index 04561375..8f1f0587 100644 --- a/client/tests/Makefile.am +++ b/client/tests/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) AM_CPPFLAGS += -DLOCALSTATEDIR='"."' AM_CPPFLAGS += -DCLIENT_PATH='"."' -EXTRA_DIST = Atffile duid0_test.txt duid1_test.txt duid2_test.txt duid3_test.txt +EXTRA_DIST = Atffile Kyuafile +EXTRA_DIST += duid0_test.txt duid1_test.txt duid2_test.txt duid3_test.txt # for autotools debugging only info: @@ -37,6 +38,7 @@ duid_unittests_LDADD += $(DHCPLIBS) check: $(ATF_TESTS) @if test $(top_srcdir) != ${top_builddir}; then \ cp $(top_srcdir)/client/tests/Atffile Atffile; \ + cp $(top_srcdir)/client/tests/Kyuafile Kyuafile; \ cp $(top_srcdir)/client/tests/duid0_test.txt duid0_test.txt; \ cp $(top_srcdir)/client/tests/duid1_test.txt duid1_test.txt; \ cp $(top_srcdir)/client/tests/duid2_test.txt duid2_test.txt; \ @@ -46,7 +48,8 @@ check: $(ATF_TESTS) distclean-local: @if test $(top_srcdir) != ${top_builddir}; then \ - rm -f Atffile duid0_test.txt duid1_test.txt; \ + rm -f Atffile Kyuafile; \ + rm -f duid0_test.txt duid1_test.txt; \ rm -f duid2_test.txt duid3_test.txt; \ fi diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in index f0a0525f..a7cfb89a 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -283,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UNITTESTS = @UNITTESTS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -341,7 +342,8 @@ SUBDIRS = . AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ -I@BINDDIR@/include -I$(top_srcdir) -DLOCALSTATEDIR='"."' \ -DCLIENT_PATH='"."' -EXTRA_DIST = Atffile duid0_test.txt duid1_test.txt duid2_test.txt duid3_test.txt +EXTRA_DIST = Atffile Kyuafile duid0_test.txt duid1_test.txt \ + duid2_test.txt duid3_test.txt DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ $(top_builddir)/omapip/libomapi.@A@ \ @@ -748,6 +750,7 @@ info: @HAVE_ATF_TRUE@check: $(ATF_TESTS) @HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/Atffile Atffile; \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/Kyuafile Kyuafile; \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/duid0_test.txt duid0_test.txt; \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/duid1_test.txt duid1_test.txt; \ @HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/duid2_test.txt duid2_test.txt; \ @@ -757,7 +760,8 @@ info: @HAVE_ATF_TRUE@distclean-local: @HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ -@HAVE_ATF_TRUE@ rm -f Atffile duid0_test.txt duid1_test.txt; \ +@HAVE_ATF_TRUE@ rm -f Atffile Kyuafile; \ +@HAVE_ATF_TRUE@ rm -f duid0_test.txt duid1_test.txt; \ @HAVE_ATF_TRUE@ rm -f duid2_test.txt duid3_test.txt; \ @HAVE_ATF_TRUE@ fi |