Browse Source

[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".
Kean Johnston 11 years ago
parent
commit
3ff790761f

+ 1 - 1
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 {

+ 3 - 3
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>

+ 1 - 0
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)

+ 1 - 1
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>