From: Francis Dupont Date: Wed, 2 Sep 2015 10:54:32 +0000 (+0200) Subject: [4026] Fixed the path define X-Git-Tag: trac3238_base~9^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=152b905c3d7e7e5c3fe0070d72ec9bde117a0a43;p=thirdparty%2Fkea.git [4026] Fixed the path define --- diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am index a4c9f2217f..baad1d2ed6 100644 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\" AM_CPPFLAGS += -DDHCP_DATA_DIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\" AM_CPPFLAGS += -DKEA_LFC_BUILD_DIR=\"$(abs_top_builddir)/src/bin/lfc\" +AM_CPPFLAGS += -DLOGGING_SPEC_FILE=\"$(abs_top_srcdir)/src/lib/dhcpsrv/logging.spec\" AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" AM_CXXFLAGS = $(KEA_CXXFLAGS) diff --git a/src/lib/dhcpsrv/tests/logging_unittest.cc b/src/lib/dhcpsrv/tests/logging_unittest.cc index a04f1c02f6..e7a9a42365 100644 --- a/src/lib/dhcpsrv/tests/logging_unittest.cc +++ b/src/lib/dhcpsrv/tests/logging_unittest.cc @@ -48,7 +48,7 @@ class LoggingTest : public ::testing::Test { // Tests that the spec file is valid. TEST_F(LoggingTest, basicSpec) { - std::string specfile = std::string(TEST_DATA_BUILDDIR) + "/../logging.spec"; + std::string specfile = std::string(LOGGING_SPEC_FILE); ASSERT_NO_THROW(isc::config::moduleSpecFromFile(specfile)); }