Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
dhcp
Commits
4f553fea
Commit
4f553fea
authored
Jun 09, 2016
by
Thomas Markwalder
Browse files
[master] Eliminated noisy cp error message during "make check"
Merges in rt41883.
parent
e105afa1
Changes
7
Hide whitespace changes
Inline
Side-by-side
RELNOTES
View file @
4f553fea
...
...
@@ -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.4
b1
-
None
...
...
client/tests/Makefile.am
View file @
4f553fea
...
...
@@ -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
View file @
4f553fea
...
...
@@ -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
View file @
4f553fea
...
...
@@ -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
View file @
4f553fea
...
...
@@ -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
View file @
4f553fea
...
...
@@ -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
View file @
4f553fea
...
...
@@ -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
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment