Permalink
Browse files

Fix the tests.

Due to the restructure directory layout, header files weren't found
anymore.

CConfigEntry was moved out of CConfig which had to be reflected in
ConfigTest.
  • Loading branch information...
Philantrop committed Jun 2, 2012
1 parent 40641b4 commit 4f3094e6c76863316a52bf1a7e5ec11f819e5d9f
Showing with 8 additions and 8 deletions.
  1. +4 −4 test/ConfigTest.cpp
  2. +2 −2 test/EscapeTest.cpp
  3. +2 −2 test/Makefile.in
View
@@ -6,9 +6,9 @@
* by the Free Software Foundation.
*/
-#include "ZNCDebug.h"
-#include "FileUtils.h"
-#include "Config.h"
+#include "znc/ZNCDebug.h"
+#include "znc/FileUtils.h"
+#include "znc/Config.h"
#include <cstdlib>
class CConfigTest {
@@ -113,7 +113,7 @@ class CConfigSuccessTest : public CConfigTest {
CConfig::SubConfigMapIterator it2 = conf.BeginSubConfigs();
while (it2 != conf.EndSubConfigs()) {
- map<CString, CConfig::CConfigEntry>::const_iterator it3 = it2->second.begin();
+ map<CString, CConfigEntry>::const_iterator it3 = it2->second.begin();
while (it3 != it2->second.end()) {
sRes += "->" + it2->first + "/" + it3->first + "\n";
View
@@ -6,8 +6,8 @@
* by the Free Software Foundation.
*/
-#include "ZNCString.h"
-#include "ZNCDebug.h"
+#include "znc/ZNCString.h"
+#include "znc/ZNCDebug.h"
static int testEqual(const CString& a, const CString& b, const CString& what)
{
View
@@ -5,14 +5,14 @@ srcdir := @srcdir@
VPATH := @srcdir@
CXX := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I..
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I../include
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
TARGETS := ConfigTest EscapeTest
OBJS := $(addsuffix .o, $(TARGETS))
ZNC_OBJS := Config.o ZNCDebug.o FileUtils.o Utils.o ZNCString.o MD5.o SHA256.o
-ZNC_OBJS := $(addprefix ../, $(ZNC_OBJS))
+ZNC_OBJS := $(addprefix ../src/, $(ZNC_OBJS))
ifneq "$(V)" ""
VERBOSE=1

0 comments on commit 4f3094e

Please sign in to comment.