diff options
| author | Kean Johnston <kean@isc.org> | 2013-12-17 12:12:29 +0100 |
|---|---|---|
| committer | Kean Johnston <kean@isc.org> | 2013-12-17 12:12:29 +0100 |
| commit | 3ff790761f37375de1f9eff59872405fc26e0364 (patch) | |
| tree | e4e3452fb09ac3982e292d838003eb9d9599a2f7 /tests | |
| parent | [master] Fix building with srcdir != objdir (diff) | |
| download | kea-3ff790761f37375de1f9eff59872405fc26e0364.tar.xz kea-3ff790761f37375de1f9eff59872405fc26e0364.zip | |
[3267] Use local #include directives
Some files were using #include <full/path/to/header> syntax which is
not desirable as the directory may move about in the source tree, and
all of the files it was including are local to perfdhcp so they should
be using #include "filename.h".
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tools/perfdhcp/rate_control.cc | 2 | ||||
| -rw-r--r-- | tests/tools/perfdhcp/test_control.h | 6 | ||||
| -rw-r--r-- | tests/tools/perfdhcp/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/tools/perfdhcp/tests/rate_control_unittest.cc | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/tests/tools/perfdhcp/rate_control.cc b/tests/tools/perfdhcp/rate_control.cc index 06cdd4e6df..1c2a6004fe 100644 --- a/tests/tools/perfdhcp/rate_control.cc +++ b/tests/tools/perfdhcp/rate_control.cc @@ -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 { diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h index 3b3cdb7887..5a7ef48d1a 100644 --- a/tests/tools/perfdhcp/test_control.h +++ b/tests/tools/perfdhcp/test_control.h @@ -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> diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am index 31c11ed7f9..3e4e725dcf 100644 --- a/tests/tools/perfdhcp/tests/Makefile.am +++ b/tests/tools/perfdhcp/tests/Makefile.am @@ -2,6 +2,7 @@ SUBDIRS = . testdata 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 += $(BOOST_INCLUDES) AM_CXXFLAGS = $(B10_CXXFLAGS) diff --git a/tests/tools/perfdhcp/tests/rate_control_unittest.cc b/tests/tools/perfdhcp/tests/rate_control_unittest.cc index 99fc35e8f6..829d37f114 100644 --- a/tests/tools/perfdhcp/tests/rate_control_unittest.cc +++ b/tests/tools/perfdhcp/tests/rate_control_unittest.cc @@ -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> |