[master] Eliminated noisy cp error message during "make check"

    Merges in rt41883.

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

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:

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:

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:

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:

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:

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: