mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'trac3267'

Browse Source
This commit is contained in:
Kean Johnston
2013-12-30 10:10:05 +02:00
parent 35bee74e98 210c5d0939
commit 687beb26da
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/tools/perfdhcp/Makefile.am
View File

@@ -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)

2
tests/tools/perfdhcp/rate_control.cc
View File

@@ -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 {

6
tests/tools/perfdhcp/test_control.h
View File

@@ -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>

2
tests/tools/perfdhcp/tests/Makefile.am
View File

@@ -1,7 +1,7 @@
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)

2
tests/tools/perfdhcp/tests/rate_control_unittest.cc
View File

@@ -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>