Виправлено шляхи пошуку заголовочних файлів фреймворка TUT

diff --git a/tests/Makefile b/tests/Makefile
index 56d7d95d2a613ca0d0f19eadb3e7c6a48b080aea..2ae5eb4ec6858c3aa64e5e5110777d74f523e435 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS+=-g3 -Wall -W -pedantic -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib
+CXXFLAGS+=-g3 -Wall -W -pedantic -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib -I.

 LIBS=-lpthread
 PROG=tests
 
 LIBS=-lpthread
 PROG=tests
 

diff --git a/tests/main.cpp b/tests/main.cpp
index f561cb16327f24f5f8220cbfd40b7efe84c7ba7f..55cb4e8f57a3f5e0be6e9a36f7216fee47bf4b18 100644 (file)
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,7 +1,8 @@
-#include <tut/tut.hpp>
-#include <tut_reporter.h>

 #include <iostream>
 
 #include <iostream>
 

+#include "tut/tut.hpp"
+#include "tut_reporter.h"
+

 using std::exception;
 using std::cerr;
 using std::endl;
 using std::exception;
 using std::cerr;
 using std::endl;

diff --git a/tests/test_admin_conf.cpp b/tests/test_admin_conf.cpp
index 51913d5c0839e269599be6239ae4105c530f44e1..52f09eebbd0367a353a1d4234fbecf09c214b7bb 100644 (file)
--- a/tests/test_admin_conf.cpp
+++ b/tests/test_admin_conf.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
 #include <iostream>
 

-#include <tut/tut.hpp>
+#include "tut/tut.hpp"

 
 #include "admin_conf.h"
 
 
 #include "admin_conf.h"
 

diff --git a/tests/test_conffiles.cpp b/tests/test_conffiles.cpp
index 0d83abb8ef74d104a52ce239a581084edd6b3176..e48abaf290adc01392682d6089c235b354e7ae85 100644 (file)
--- a/tests/test_conffiles.cpp
+++ b/tests/test_conffiles.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <fstream>
 
 #include <string>
 #include <fstream>
 

-#include <tut/tut.hpp>
+#include "tut/tut.hpp"

 
 #include "conffiles.h"
 
 
 #include "conffiles.h"
 

diff --git a/tests/test_raw_ip.cpp b/tests/test_raw_ip.cpp
index 6e14768670c556c1bc11e708ae3b1d22f594cafa..11e18b2f42dceeaa9d5ba52b717b33f3e699ecef 100644 (file)
--- a/tests/test_raw_ip.cpp
+++ b/tests/test_raw_ip.cpp
@@ -6,7 +6,7 @@
 #include <ctime>
 #include <iostream>
 
 #include <ctime>
 #include <iostream>
 

-#include <tut/tut.hpp>
+#include "tut/tut.hpp"

 
 #include "raw_ip_packet_old.h"
 #include "raw_ip_packet.h"
 
 #include "raw_ip_packet_old.h"
 #include "raw_ip_packet.h"

diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp
index 8e4a25a38832a8832dba459600d252deede53c9e..e00b4817bb3f1bafa5fd1c2c2b99d8dfd6e1f281 100644 (file)
--- a/tests/test_tariff.cpp
+++ b/tests/test_tariff.cpp
@@ -1,4 +1,4 @@
-#include <tut/tut.hpp>
+#include "tut/tut.hpp"

 
 #include "tariff_conf.h"
 #include "tariff.h"
 
 #include "tariff_conf.h"
 #include "tariff.h"