diff options
| author | Thomas Markwalder <tmark@isc.org> | 2016-06-09 07:52:12 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2016-06-09 07:52:12 -0400 |
| commit | 4f553fea3b3cb27a1c5fb8ea9be77f270d0b0de8 (patch) | |
| tree | 448098babdd8dc07ce71b94751accacd1e76588f /server | |
| parent | e105afa15e09176799a37617968dabde50988273 (diff) | |
| download | isc-dhcp-4f553fea3b3cb27a1c5fb8ea9be77f270d0b0de8.tar.gz | |
[master] Eliminated noisy cp error message during "make check"
Merges in rt41883.
Diffstat (limited to 'server')
| -rw-r--r-- | server/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | server/tests/Makefile.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 65a9f740..a87c5e7b 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 0306a730..b86a952d 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: |