Commit ec0d87d2 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Fixed distcheck failures/

Unit tests in lib/config/tests and bin/dhcp4/tests were attempting
to write to TEST_DATA_DIR rather than TEST_DATA_BUILDDIR, make distcheck
to fail.
parent c7e23e8e
......@@ -22,7 +22,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/dhcp6/tests\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/dhcp4/tests\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
......
......@@ -274,7 +274,7 @@ TEST_F(CtrlDhcpv4SrvTest, commandsRegistration) {
/// other unit-tests.
TEST_F(CtrlDhcpv4SrvTest, DISABLED_commandSocketBasic) {
string socket_path = string(TEST_DATA_DIR) + "/kea4.sock";
string socket_path = string(TEST_DATA_BUILDDIR) + "/kea4.sock";
::remove(socket_path.c_str());
// Just a simple config. The important part here is the socket
......
......@@ -3,6 +3,7 @@ SUBDIRS = testdata .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/config/tests\"
AM_CXXFLAGS = $(KEA_CXXFLAGS)
......
......@@ -44,7 +44,7 @@ public:
};
const std::string CommandSocketFactoryTest::SOCKET_NAME =
std::string(TEST_DATA_DIR) + "/test-socket";
std::string(TEST_DATA_BUILDDIR) + "/test-socket";
TEST_F(CommandSocketFactoryTest, unixCreate) {
// Null pointer is obviously a bad idea.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment