From 87aae6506d6b530ab954cd8eeb7c3d40664115bc Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 18 Dec 2010 18:43:28 +0200 Subject: [PATCH] =?utf8?q?=D0=92=D0=B8=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?utf8?q?=D0=BD=D0=BE=20=D1=88=D0=BB=D1=8F=D1=85=D0=B8=20=D0=BF=D0=BE?= =?utf8?q?=D1=88=D1=83=D0=BA=D1=83=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE?= =?utf8?q?=D0=B2=D0=BE=D1=87=D0=BD=D0=B8=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB?= =?utf8?q?=D1=96=D0=B2=20=D1=84=D1=80=D0=B5=D0=B9=D0=BC=D0=B2=D0=BE=D1=80?= =?utf8?q?=D0=BA=D0=B0=20TUT?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tests/Makefile | 2 +- tests/main.cpp | 5 +++-- tests/test_admin_conf.cpp | 2 +- tests/test_conffiles.cpp | 2 +- tests/test_raw_ip.cpp | 2 +- tests/test_tariff.cpp | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) 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" -- 2.44.2