Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Yershov <yershov@corp.mail.ru>2015-04-10 13:08:21 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:45:57 +0300
commit8c81d215d3373ea912d69c44bba916ea25aa2bf5 (patch)
tree3824f0094e213486605f7eb461bd64f5cf87b787 /testing
parent6aa0d53a685e7fcece488f3bdeaa8953ca430baf (diff)
Fix include path for testing
Diffstat (limited to 'testing')
-rw-r--r--testing/benchmark.hpp8
-rw-r--r--testing/testing.hpp12
-rw-r--r--testing/testing_utils.hpp2
-rw-r--r--testing/testingmain.cpp18
4 files changed, 20 insertions, 20 deletions
diff --git a/testing/benchmark.hpp b/testing/benchmark.hpp
index b7c8972967..dea7407714 100644
--- a/testing/benchmark.hpp
+++ b/testing/benchmark.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include "testing.hpp"
-#include "testregister.hpp"
-#include "../base/timer.hpp"
-#include "../std/iostream.hpp"
+#include "testing/testing.hpp"
+#include "testing/testregister.hpp"
+#include "base/timer.hpp"
+#include "std/iostream.hpp"
namespace my
{
diff --git a/testing/testing.hpp b/testing/testing.hpp
index 5f6b671d14..a866b8d13f 100644
--- a/testing/testing.hpp
+++ b/testing/testing.hpp
@@ -1,12 +1,12 @@
#pragma once
-#include "testregister.hpp"
+#include "testing/testregister.hpp"
-#include "../base/exception.hpp"
-#include "../base/math.hpp"
-#include "../base/src_point.hpp"
+#include "base/exception.hpp"
+#include "base/math.hpp"
+#include "base/src_point.hpp"
-#include "../std/iostream.hpp"
-#include "../std/string.hpp"
+#include "std/iostream.hpp"
+#include "std/string.hpp"
#define UNIT_TEST(name) \
diff --git a/testing/testing_utils.hpp b/testing/testing_utils.hpp
index 32cd279f4e..67a6ddf050 100644
--- a/testing/testing_utils.hpp
+++ b/testing/testing_utils.hpp
@@ -1,5 +1,5 @@
#pragma once
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
template <typename T> vector<T> Vec(T x0)
{
diff --git a/testing/testingmain.cpp b/testing/testingmain.cpp
index 58c3d6032d..425a70e04b 100644
--- a/testing/testingmain.cpp
+++ b/testing/testingmain.cpp
@@ -1,14 +1,14 @@
-#include "testregister.hpp"
-#include "testing.hpp"
+#include "testing/testregister.hpp"
+#include "testing/testing.hpp"
-#include "../base/logging.hpp"
-#include "../base/string_utils.hpp"
-#include "../base/regexp.hpp"
+#include "base/logging.hpp"
+#include "base/string_utils.hpp"
+#include "base/regexp.hpp"
-#include "../std/iostream.hpp"
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
-#include "../std/target_os.hpp"
+#include "std/iostream.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
+#include "std/target_os.hpp"
#ifdef OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP