From: Thomas Markwalder Date: Thu, 9 Jun 2016 11:52:12 +0000 (-0400) Subject: [master] Eliminated noisy cp error message during "make check" X-Git-Tag: v4_3_5b1~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f553fea3b3cb27a1c5fb8ea9be77f270d0b0de8;p=thirdparty%2Fdhcp.git [master] Eliminated noisy cp error message during "make check" Merges in rt41883. --- diff --git a/RELNOTES b/RELNOTES index 6863556f0..06d420bb5 100644 --- a/RELNOTES +++ b/RELNOTES @@ -66,6 +66,11 @@ by Eric Young (eay@cryptsoft.com). returned in responses. [ISC-Bugs #29246] +- Add logic to test directory Makefiles to avoid copying Attfile(s) + when building within the source tree. This eliminates a noisy but + otherwise harmless error message when running "make check". + [ISC-Bugs #41883] + Changes since 4.3.4b1 - None diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am index da69ea923..5031d0c54 100644 --- a/client/tests/Makefile.am +++ b/client/tests/Makefile.am @@ -34,11 +34,13 @@ duid_unittests_LDADD = $(ATF_LDFLAGS) duid_unittests_LDADD += $(DHCPLIBS) check: $(ATF_TESTS) - -cp -n $(top_srcdir)/client/tests/Atffile Atffile - -cp -n $(top_srcdir)/client/tests/duid0_test.txt duid0_test.txt - -cp -n $(top_srcdir)/client/tests/duid1_test.txt duid1_test.txt - -cp -n $(top_srcdir)/client/tests/duid2_test.txt duid2_test.txt - -cp -n $(top_srcdir)/client/tests/duid3_test.txt duid3_test.txt + @if test $(top_srcdir) != ${top_builddir}; then \ + cp $(top_srcdir)/client/tests/Atffile Atffile; \ + 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; \ + cp $(top_srcdir)/client/tests/duid3_test.txt duid3_test.txt; \ + fi sh ${top_builddir}/tests/unittest.sh distclean-local: diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in index a17bf101f..416adddea 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -729,11 +729,13 @@ info: @echo "ATF_LIBS=$(ATF_LIBS)" @HAVE_ATF_TRUE@check: $(ATF_TESTS) -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/client/tests/Atffile Atffile -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/client/tests/duid0_test.txt duid0_test.txt -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/client/tests/duid1_test.txt duid1_test.txt -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/client/tests/duid2_test.txt duid2_test.txt -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/client/tests/duid3_test.txt duid3_test.txt +@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/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; \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/client/tests/duid3_test.txt duid3_test.txt; \ +@HAVE_ATF_TRUE@ fi @HAVE_ATF_TRUE@ sh ${top_builddir}/tests/unittest.sh @HAVE_ATF_TRUE@distclean-local: diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index f8d6b0e21..f6a43e422 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -37,7 +37,9 @@ ns_name_unittest_LDADD += ../libdhcp.a \ $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a check: $(ATF_TESTS) - -cp -n $(top_srcdir)/common/tests/Atffile Atffile + @if test $(top_srcdir) != ${top_builddir}; then \ + cp $(top_srcdir)/common/tests/Atffile Atffile; \ + fi sh ${top_builddir}/tests/unittest.sh distclean-local: diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index 7d730ef45..9c37fc2b0 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -762,7 +762,9 @@ uninstall-am: @HAVE_ATF_TRUE@check: $(ATF_TESTS) -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/common/tests/Atffile Atffile +@HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/common/tests/Atffile Atffile; \ +@HAVE_ATF_TRUE@ fi @HAVE_ATF_TRUE@ sh ${top_builddir}/tests/unittest.sh @HAVE_ATF_TRUE@distclean-local: diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 65a9f7403..a87c5e7be 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -51,7 +51,9 @@ leaseq_unittests_SOURCES = $(DHCPSRC) leaseq_unittest.c leaseq_unittests_LDADD = $(DHCPLIBS) $(ATF_LDFLAGS) check: $(ATF_TESTS) - -cp -n $(top_srcdir)/server/tests/Atffile Atffile + @if test $(top_srcdir) != ${top_builddir}; then \ + cp $(top_srcdir)/server/tests/Atffile Atffile; \ + fi sh ${top_builddir}/tests/unittest.sh distclean-local: diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in index 0306a7300..b86a952d9 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -1048,7 +1048,9 @@ info: @echo "ATF_LIBS=$(ATF_LIBS)" @HAVE_ATF_TRUE@check: $(ATF_TESTS) -@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/server/tests/Atffile Atffile +@HAVE_ATF_TRUE@ @if test $(top_srcdir) != ${top_builddir}; then \ +@HAVE_ATF_TRUE@ cp $(top_srcdir)/server/tests/Atffile Atffile; \ +@HAVE_ATF_TRUE@ fi @HAVE_ATF_TRUE@ sh ${top_builddir}/tests/unittest.sh @HAVE_ATF_TRUE@distclean-local: