Commit 687beb26 authored by Kean Johnston's avatar Kean Johnston
Browse files

Merge branch 'trac3267'

parents 35bee74e 210c5d09
...@@ -2,7 +2,6 @@ SUBDIRS = . tests ...@@ -2,7 +2,6 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(B10_CXXFLAGS)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <tests/tools/perfdhcp/rate_control.h> #include "rate_control.h"
namespace isc { namespace isc {
namespace perfdhcp { namespace perfdhcp {
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#ifndef TEST_CONTROL_H #ifndef TEST_CONTROL_H
#define TEST_CONTROL_H #define TEST_CONTROL_H
#include <tests/tools/perfdhcp/packet_storage.h> #include "packet_storage.h"
#include <tests/tools/perfdhcp/rate_control.h> #include "rate_control.h"
#include <tests/tools/perfdhcp/stats_mgr.h> #include "stats_mgr.h"
#include <dhcp/iface_mgr.h> #include <dhcp/iface_mgr.h>
#include <dhcp/dhcp6.h> #include <dhcp/dhcp6.h>
......
SUBDIRS = . testdata SUBDIRS = . testdata
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\" AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(B10_CXXFLAGS)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <tests/tools/perfdhcp/rate_control.h> #include "rate_control.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
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