Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
687beb26
Commit
687beb26
authored
Dec 30, 2013
by
Kean Johnston
Browse files
Merge branch 'trac3267'
parents
35bee74e
210c5d09
Changes
5
Hide whitespace changes
Inline
Side-by-side
tests/tools/perfdhcp/Makefile.am
View file @
687beb26
...
...
@@ -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/log
-I
$(top_builddir)
/src/lib/log
AM_CPPFLAGS
+=
-I
$(top_builddir)
-I
$(top_srcdir)
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
...
...
tests/tools/perfdhcp/rate_control.cc
View file @
687beb26
...
...
@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <exceptions/exceptions.h>
#include
<tests/tools/perfdhcp/
rate_control.h
>
#include
"
rate_control.h
"
namespace
isc
{
namespace
perfdhcp
{
...
...
tests/tools/perfdhcp/test_control.h
View file @
687beb26
...
...
@@ -15,9 +15,9 @@
#ifndef TEST_CONTROL_H
#define TEST_CONTROL_H
#include
<tests/tools/perfdhcp/
packet_storage.h
>
#include
<tests/tools/perfdhcp/
rate_control.h
>
#include
<tests/tools/perfdhcp/
stats_mgr.h
>
#include
"
packet_storage.h
"
#include
"
rate_control.h
"
#include
"
stats_mgr.h
"
#include <dhcp/iface_mgr.h>
#include <dhcp/dhcp6.h>
...
...
tests/tools/perfdhcp/tests/Makefile.am
View file @
687beb26
SUBDIRS
=
.
testdata
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
-I
$(
top_build
dir)
-I
$(
top_src
dir)
AM_CPPFLAGS
+=
-I
$(
src
dir)
/..
-I
$(
build
dir)
/..
AM_CPPFLAGS
+=
-DTEST_DATA_DIR
=
\"
$(abs_srcdir)
/testdata
\"
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
...
...
tests/tools/perfdhcp/tests/rate_control_unittest.cc
View file @
687beb26
...
...
@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <exceptions/exceptions.h>
#include
<tests/tools/perfdhcp/
rate_control.h
>
#include
"
rate_control.h
"
#include <gtest/gtest.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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