Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14217 from alalek:fix_world_gapi_tests

Browse Source
pull/14235/head
Alexander Alekhin 6 years ago
parent 785a540ebd cd6d8048bb
commit 14843679af
27 changed files with 31 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      cmake/OpenCVModule.cmake
  2. 1
      cmake/OpenCVPCHSupport.cmake
  3. 2
      modules/gapi/perf/common/gapi_core_perf_tests.cpp
  4. 2
      modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp
  5. 2
      modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp
  6. 2
      modules/gapi/test/common/gapi_compoundkernel_tests.cpp
  7. 2
      modules/gapi/test/common/gapi_core_tests.cpp
  8. 2
      modules/gapi/test/common/gapi_imgproc_tests.cpp
  9. 2
      modules/gapi/test/common/gapi_operators_tests.cpp
  10. 2
      modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp
  11. 4
      modules/gapi/test/internal/gapi_int_backend_tests.cpp
  12. 2
      modules/gapi/test/internal/gapi_int_executor_tests.cpp
  13. 2
      modules/gapi/test/internal/gapi_int_garg_test.cpp
  14. 2
      modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
  15. 2
      modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
  16. 4
      modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp
  17. 2
      modules/gapi/test/internal/gapi_int_island_tests.cpp
  18. 2
      modules/gapi/test/internal/gapi_int_recompilation_test.cpp
  19. 4
      modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp
  20. 2
      modules/gapi/test/internal/gapi_int_vectorref_test.cpp
  21. 2
      modules/gapi/test/internal/gapi_transactions_test.cpp
  22. 2
      modules/gapi/test/own/gapi_types_tests.cpp
  23. 2
      modules/gapi/test/own/mat_tests.cpp
  24. 2
      modules/gapi/test/own/scalar_tests.cpp
  25. 2
      modules/gapi/test/util/any_tests.cpp
  26. 2
      modules/gapi/test/util/optional_tests.cpp
  27. 2
      modules/gapi/test/util/variant_tests.cpp

4
cmake/OpenCVModule.cmake
Unescape View File

@ -1148,7 +1148,7 @@ function(ocv_add_perf_tests)
source_group("Src" FILES "${${the_target}_pch}") source_group("Src" FILES "${${the_target}_pch}")
ocv_add_executable(${the_target} ${OPENCV_PERF_${the_module}_SOURCES} ${${the_target}_pch}) ocv_add_executable(${the_target} ${OPENCV_PERF_${the_module}_SOURCES} ${${the_target}_pch})
ocv_target_include_modules(${the_target} ${perf_deps} "${perf_path}") ocv_target_include_modules(${the_target} ${perf_deps})
ocv_target_link_libraries(${the_target} LINK_PRIVATE ${perf_deps} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS} ${OPENCV_PERF_${the_module}_DEPS}) ocv_target_link_libraries(${the_target} LINK_PRIVATE ${perf_deps} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS} ${OPENCV_PERF_${the_module}_DEPS})
add_dependencies(opencv_perf_tests ${the_target}) add_dependencies(opencv_perf_tests ${the_target})
@ -1239,7 +1239,7 @@ function(ocv_add_accuracy_tests)
source_group("Src" FILES "${${the_target}_pch}") source_group("Src" FILES "${${the_target}_pch}")
ocv_add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch}) ocv_add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
ocv_target_include_modules(${the_target} ${test_deps} "${test_path}") ocv_target_include_modules(${the_target} ${test_deps})
if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/test") if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/test")
ocv_target_include_directories(${the_target} "${CMAKE_CURRENT_BINARY_DIR}/test") ocv_target_include_directories(${the_target} "${CMAKE_CURRENT_BINARY_DIR}/test")
endif() endif()

1
cmake/OpenCVPCHSupport.cmake
Unescape View File

@ -261,6 +261,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
) )
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS) _PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
list(APPEND _compile_FLAGS "${_PCH_include_prefix}\"${_path}\"")
get_target_property(type ${_targetName} TYPE) get_target_property(type ${_targetName} TYPE)
if(type STREQUAL "SHARED_LIBRARY") if(type STREQUAL "SHARED_LIBRARY")

2
modules/gapi/perf/common/gapi_core_perf_tests.cpp
Unescape View File

@ -5,5 +5,5 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "perf_precomp.hpp" #include "../perf_precomp.hpp"
#include "gapi_core_perf_tests_inl.hpp" #include "gapi_core_perf_tests_inl.hpp"

2
modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp
Unescape View File

@ -5,5 +5,5 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "perf_precomp.hpp" #include "../perf_precomp.hpp"
#include "gapi_imgproc_perf_tests_inl.hpp" #include "gapi_imgproc_perf_tests_inl.hpp"

2
modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "perf_precomp.hpp" #include "../perf_precomp.hpp"
#include "../../test/common/gapi_tests_common.hpp" #include "../../test/common/gapi_tests_common.hpp"
namespace opencv_test namespace opencv_test

2
modules/gapi/test/common/gapi_compoundkernel_tests.cpp
Unescape View File

@ -7,7 +7,7 @@
// FIXME: move out from Common // FIXME: move out from Common
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/cpu/core.hpp" #include "opencv2/gapi/cpu/core.hpp"
#include <ade/util/algorithm.hpp> #include <ade/util/algorithm.hpp>

2
modules/gapi/test/common/gapi_core_tests.cpp
Unescape View File

@ -5,5 +5,5 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "gapi_core_tests_inl.hpp" #include "gapi_core_tests_inl.hpp"

2
modules/gapi/test/common/gapi_imgproc_tests.cpp
Unescape View File

@ -5,5 +5,5 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "gapi_imgproc_tests_inl.hpp" #include "gapi_imgproc_tests_inl.hpp"

2
modules/gapi/test/common/gapi_operators_tests.cpp
Unescape View File

@ -5,5 +5,5 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "gapi_operators_tests_inl.hpp" #include "gapi_operators_tests_inl.hpp"

2
modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "../common/gapi_operators_tests.hpp" #include "../common/gapi_operators_tests.hpp"
#define CORE_FLUID cv::gapi::core::fluid::kernels() #define CORE_FLUID cv::gapi::core::fluid::kernels()

4
modules/gapi/test/internal/gapi_int_backend_tests.cpp
Unescape View File

@ -5,8 +5,8 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "gapi_mock_kernels.hpp" #include "../gapi_mock_kernels.hpp"
#include "compiler/gmodel.hpp" #include "compiler/gmodel.hpp"
#include "compiler/gcompiler.hpp" #include "compiler/gcompiler.hpp"

2
modules/gapi/test/internal/gapi_int_executor_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
namespace opencv_test namespace opencv_test
{ {

2
modules/gapi/test/internal/gapi_int_garg_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
namespace opencv_test { namespace opencv_test {
// Tests on T/Kind matching //////////////////////////////////////////////////// // Tests on T/Kind matching ////////////////////////////////////////////////////

2
modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "api/gcomputation_priv.hpp" #include "api/gcomputation_priv.hpp"

2
modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include <ade/util/zip_range.hpp> // util::indexed #include <ade/util/zip_range.hpp> // util::indexed

4
modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp
Unescape View File

@ -5,10 +5,10 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "compiler/transactions.hpp" #include "compiler/transactions.hpp"
#include "gapi_mock_kernels.hpp" #include "../gapi_mock_kernels.hpp"
#include "compiler/gmodel.hpp" #include "compiler/gmodel.hpp"
#include "compiler/gislandmodel.hpp" #include "compiler/gislandmodel.hpp"

2
modules/gapi/test/internal/gapi_int_island_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "compiler/gmodel.hpp" #include "compiler/gmodel.hpp"
#include "compiler/gcompiled_priv.hpp" #include "compiler/gcompiled_priv.hpp"

2
modules/gapi/test/internal/gapi_int_recompilation_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "api/gcomputation_priv.hpp" #include "api/gcomputation_priv.hpp"
#include "opencv2/gapi/fluid/gfluidkernel.hpp" #include "opencv2/gapi/fluid/gfluidkernel.hpp"

4
modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp
Unescape View File

@ -5,9 +5,9 @@
// Copyright (C) 2018 Intel Corporation // 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 namespace opencv_test
{ {

2
modules/gapi/test/internal/gapi_int_vectorref_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
namespace opencv_test namespace opencv_test
{ {

2
modules/gapi/test/internal/gapi_transactions_test.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include <ade/graph.hpp> #include <ade/graph.hpp>
#include "compiler/transactions.hpp" #include "compiler/transactions.hpp"

2
modules/gapi/test/own/gapi_types_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/own/types.hpp" #include "opencv2/gapi/own/types.hpp"
namespace opencv_test namespace opencv_test

2
modules/gapi/test/own/mat_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/own/mat.hpp" #include "opencv2/gapi/own/mat.hpp"
#include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning #include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning

2
modules/gapi/test/own/scalar_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/own/scalar.hpp" #include "opencv2/gapi/own/scalar.hpp"
namespace opencv_test namespace opencv_test

2
modules/gapi/test/util/any_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/util/any.hpp" #include "opencv2/gapi/util/any.hpp"
namespace opencv_test namespace opencv_test

2
modules/gapi/test/util/optional_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/util/optional.hpp" #include "opencv2/gapi/util/optional.hpp"
#include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning #include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning

2
modules/gapi/test/util/variant_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/util/variant.hpp" #include "opencv2/gapi/util/variant.hpp"
#include <cstddef> //std::max_align_t #include <cstddef> //std::max_align_t

Write Preview
Loading…
Cancel
Save