From: Maxim Mamontov Date: Sat, 18 Dec 2010 16:43:28 +0000 (+0200) Subject: Виправлено шляхи пошуку заголовочних файлів фреймворка TUT X-Git-Tag: 2.407-rc3~236 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/87aae6506d6b530ab954cd8eeb7c3d40664115bc Виправлено шляхи пошуку заголовочних файлів фреймворка TUT --- diff --git a/tests/Makefile b/tests/Makefile index 56d7d95d..2ae5eb4e 100644 --- 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 diff --git a/tests/main.cpp b/tests/main.cpp index f561cb16..55cb4e8f 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,7 +1,8 @@ -#include -#include #include +#include "tut/tut.hpp" +#include "tut_reporter.h" + using std::exception; using std::cerr; using std::endl; diff --git a/tests/test_admin_conf.cpp b/tests/test_admin_conf.cpp index 51913d5c..52f09eeb 100644 --- a/tests/test_admin_conf.cpp +++ b/tests/test_admin_conf.cpp @@ -1,6 +1,6 @@ #include -#include +#include "tut/tut.hpp" #include "admin_conf.h" diff --git a/tests/test_conffiles.cpp b/tests/test_conffiles.cpp index 0d83abb8..e48abaf2 100644 --- a/tests/test_conffiles.cpp +++ b/tests/test_conffiles.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include "tut/tut.hpp" #include "conffiles.h" diff --git a/tests/test_raw_ip.cpp b/tests/test_raw_ip.cpp index 6e147686..11e18b2f 100644 --- a/tests/test_raw_ip.cpp +++ b/tests/test_raw_ip.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include "tut/tut.hpp" #include "raw_ip_packet_old.h" #include "raw_ip_packet.h" diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp index 8e4a25a3..e00b4817 100644 --- a/tests/test_tariff.cpp +++ b/tests/test_tariff.cpp @@ -1,4 +1,4 @@ -#include +#include "tut/tut.hpp" #include "tariff_conf.h" #include "tariff.h"