From cd6d8048bb129c1975faa3e21ca2990f1ffaefab Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Mon, 1 Apr 2019 17:31:03 +0300
Subject: [PATCH] gapi: fix tests build

---
 modules/gapi/perf/common/gapi_core_perf_tests.cpp           | 2 +-
 modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp        | 2 +-
 modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp     | 2 +-
 modules/gapi/test/common/gapi_compoundkernel_tests.cpp      | 2 +-
 modules/gapi/test/common/gapi_core_tests.cpp                | 2 +-
 modules/gapi/test/common/gapi_imgproc_tests.cpp             | 2 +-
 modules/gapi/test/common/gapi_operators_tests.cpp           | 2 +-
 modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp        | 2 +-
 modules/gapi/test/internal/gapi_int_backend_tests.cpp       | 4 ++--
 modules/gapi/test/internal/gapi_int_executor_tests.cpp      | 2 +-
 modules/gapi/test/internal/gapi_int_garg_test.cpp           | 2 +-
 modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp       | 2 +-
 modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp | 2 +-
 modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp | 4 ++--
 modules/gapi/test/internal/gapi_int_island_tests.cpp        | 2 +-
 modules/gapi/test/internal/gapi_int_recompilation_test.cpp  | 2 +-
 modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp | 4 ++--
 modules/gapi/test/internal/gapi_int_vectorref_test.cpp      | 2 +-
 modules/gapi/test/internal/gapi_transactions_test.cpp       | 2 +-
 modules/gapi/test/own/gapi_types_tests.cpp                  | 2 +-
 modules/gapi/test/own/mat_tests.cpp                         | 2 +-
 modules/gapi/test/own/scalar_tests.cpp                      | 2 +-
 modules/gapi/test/util/any_tests.cpp                        | 2 +-
 modules/gapi/test/util/optional_tests.cpp                   | 2 +-
 modules/gapi/test/util/variant_tests.cpp                    | 2 +-
 25 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/gapi/perf/common/gapi_core_perf_tests.cpp b/modules/gapi/perf/common/gapi_core_perf_tests.cpp
index 2df4d88..2c075c7 100644
--- a/modules/gapi/perf/common/gapi_core_perf_tests.cpp
+++ b/modules/gapi/perf/common/gapi_core_perf_tests.cpp
@@ -5,5 +5,5 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "perf_precomp.hpp"
+#include "../perf_precomp.hpp"
 #include "gapi_core_perf_tests_inl.hpp"
diff --git a/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp b/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp
index 5a2ffb8..a3ccb15 100644
--- a/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp
+++ b/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp
@@ -5,5 +5,5 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "perf_precomp.hpp"
+#include "../perf_precomp.hpp"
 #include "gapi_imgproc_perf_tests_inl.hpp"
diff --git a/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp b/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp
index 48786b6..e476e22 100644
--- a/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp
+++ b/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "perf_precomp.hpp"
+#include "../perf_precomp.hpp"
 #include "../../test/common/gapi_tests_common.hpp"
 
 namespace opencv_test
diff --git a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp
index 1f5de7a..d1d8793 100644
--- a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp
+++ b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp
@@ -7,7 +7,7 @@
 
 // FIXME: move out from Common
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/cpu/core.hpp"
 
 #include <ade/util/algorithm.hpp>
diff --git a/modules/gapi/test/common/gapi_core_tests.cpp b/modules/gapi/test/common/gapi_core_tests.cpp
index eb77612..ea697b2 100644
--- a/modules/gapi/test/common/gapi_core_tests.cpp
+++ b/modules/gapi/test/common/gapi_core_tests.cpp
@@ -5,5 +5,5 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "gapi_core_tests_inl.hpp"
diff --git a/modules/gapi/test/common/gapi_imgproc_tests.cpp b/modules/gapi/test/common/gapi_imgproc_tests.cpp
index b7c0279..f9660e7 100644
--- a/modules/gapi/test/common/gapi_imgproc_tests.cpp
+++ b/modules/gapi/test/common/gapi_imgproc_tests.cpp
@@ -5,5 +5,5 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "gapi_imgproc_tests_inl.hpp"
diff --git a/modules/gapi/test/common/gapi_operators_tests.cpp b/modules/gapi/test/common/gapi_operators_tests.cpp
index 1f6f0ce..dc62be8 100644
--- a/modules/gapi/test/common/gapi_operators_tests.cpp
+++ b/modules/gapi/test/common/gapi_operators_tests.cpp
@@ -5,5 +5,5 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "gapi_operators_tests_inl.hpp"
diff --git a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp
index 4179fa5..b3e54bb 100644
--- a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp
+++ b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "../common/gapi_operators_tests.hpp"
 
 #define CORE_FLUID cv::gapi::core::fluid::kernels()
diff --git a/modules/gapi/test/internal/gapi_int_backend_tests.cpp b/modules/gapi/test/internal/gapi_int_backend_tests.cpp
index 67b6273..0a60285 100644
--- a/modules/gapi/test/internal/gapi_int_backend_tests.cpp
+++ b/modules/gapi/test/internal/gapi_int_backend_tests.cpp
@@ -5,8 +5,8 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
-#include "gapi_mock_kernels.hpp"
+#include "../test_precomp.hpp"
+#include "../gapi_mock_kernels.hpp"
 
 #include "compiler/gmodel.hpp"
 #include "compiler/gcompiler.hpp"
diff --git a/modules/gapi/test/internal/gapi_int_executor_tests.cpp b/modules/gapi/test/internal/gapi_int_executor_tests.cpp
index 20aad89..1a465b3 100644
--- a/modules/gapi/test/internal/gapi_int_executor_tests.cpp
+++ b/modules/gapi/test/internal/gapi_int_executor_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 namespace opencv_test
 {
diff --git a/modules/gapi/test/internal/gapi_int_garg_test.cpp b/modules/gapi/test/internal/gapi_int_garg_test.cpp
index 67696db..e66a644 100644
--- a/modules/gapi/test/internal/gapi_int_garg_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_garg_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 namespace opencv_test {
 // Tests on T/Kind matching ////////////////////////////////////////////////////
diff --git a/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp b/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
index 2a3ff5e..3f88d64 100644
--- a/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 #include "api/gcomputation_priv.hpp"
 
diff --git a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
index a815e0d..f5de114 100644
--- a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 #include <ade/util/zip_range.hpp>   // util::indexed
 
diff --git a/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp b/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp
index 7fdb1bc..33f0eeb 100644
--- a/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp
+++ b/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp
@@ -5,10 +5,10 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "compiler/transactions.hpp"
 
-#include "gapi_mock_kernels.hpp"
+#include "../gapi_mock_kernels.hpp"
 
 #include "compiler/gmodel.hpp"
 #include "compiler/gislandmodel.hpp"
diff --git a/modules/gapi/test/internal/gapi_int_island_tests.cpp b/modules/gapi/test/internal/gapi_int_island_tests.cpp
index d593006..06a5b8c 100644
--- a/modules/gapi/test/internal/gapi_int_island_tests.cpp
+++ b/modules/gapi/test/internal/gapi_int_island_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 #include "compiler/gmodel.hpp"
 #include "compiler/gcompiled_priv.hpp"
diff --git a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp
index 252af9c..833ea17 100644
--- a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "api/gcomputation_priv.hpp"
 
 #include "opencv2/gapi/fluid/gfluidkernel.hpp"
diff --git a/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp b/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp
index d4b16f6..c0411f4 100644
--- a/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp
@@ -5,9 +5,9 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
-#include "gapi_mock_kernels.hpp"
+#include "../gapi_mock_kernels.hpp"
 
 namespace opencv_test
 {
diff --git a/modules/gapi/test/internal/gapi_int_vectorref_test.cpp b/modules/gapi/test/internal/gapi_int_vectorref_test.cpp
index 53c800f..1b6698b 100644
--- a/modules/gapi/test/internal/gapi_int_vectorref_test.cpp
+++ b/modules/gapi/test/internal/gapi_int_vectorref_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 
 namespace opencv_test
 {
diff --git a/modules/gapi/test/internal/gapi_transactions_test.cpp b/modules/gapi/test/internal/gapi_transactions_test.cpp
index f550340..ac77c33 100644
--- a/modules/gapi/test/internal/gapi_transactions_test.cpp
+++ b/modules/gapi/test/internal/gapi_transactions_test.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include <ade/graph.hpp>
 #include "compiler/transactions.hpp"
 
diff --git a/modules/gapi/test/own/gapi_types_tests.cpp b/modules/gapi/test/own/gapi_types_tests.cpp
index c254357..d843190 100644
--- a/modules/gapi/test/own/gapi_types_tests.cpp
+++ b/modules/gapi/test/own/gapi_types_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/own/types.hpp"
 
 namespace opencv_test
diff --git a/modules/gapi/test/own/mat_tests.cpp b/modules/gapi/test/own/mat_tests.cpp
index ba2cd2d..a6453c6 100644
--- a/modules/gapi/test/own/mat_tests.cpp
+++ b/modules/gapi/test/own/mat_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/own/mat.hpp"
 #include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning
 
diff --git a/modules/gapi/test/own/scalar_tests.cpp b/modules/gapi/test/own/scalar_tests.cpp
index a9c5c01..0ee626c 100644
--- a/modules/gapi/test/own/scalar_tests.cpp
+++ b/modules/gapi/test/own/scalar_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/own/scalar.hpp"
 
 namespace opencv_test
diff --git a/modules/gapi/test/util/any_tests.cpp b/modules/gapi/test/util/any_tests.cpp
index 60bbcc1..1c6c9cc 100644
--- a/modules/gapi/test/util/any_tests.cpp
+++ b/modules/gapi/test/util/any_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/util/any.hpp"
 
 namespace opencv_test
diff --git a/modules/gapi/test/util/optional_tests.cpp b/modules/gapi/test/util/optional_tests.cpp
index b7fabd5..7b6cdb1 100644
--- a/modules/gapi/test/util/optional_tests.cpp
+++ b/modules/gapi/test/util/optional_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/util/optional.hpp"
 #include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning
 
diff --git a/modules/gapi/test/util/variant_tests.cpp b/modules/gapi/test/util/variant_tests.cpp
index a95b6aa..328afe7 100644
--- a/modules/gapi/test/util/variant_tests.cpp
+++ b/modules/gapi/test/util/variant_tests.cpp
@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "test_precomp.hpp"
+#include "../test_precomp.hpp"
 #include "opencv2/gapi/util/variant.hpp"
 #include <cstddef> //std::max_align_t
 
-- 
2.7.4