[IE TESTS] Remove extra dependency from Shared lib (#3006)

* [IE TESTS][IE CMAKE] Add cmake option for configuration to skip tests

* [IE TESTS] Remove extra dependency from IE tests shared lib

* Revert to add flag

diff --git a/inference-engine/tests/functional/plugin/myriad/CMakeLists.txt b/inference-engine/tests/functional/plugin/myriad/CMakeLists.txt
index c50d88b..3d96584 100644 (file)
--- a/inference-engine/tests/functional/plugin/myriad/CMakeLists.txt
+++ b/inference-engine/tests/functional/plugin/myriad/CMakeLists.txt
@@ -12,6 +12,7 @@ addIeTargetTest(
         ROOT ${CMAKE_CURRENT_SOURCE_DIR}
         INCLUDES
             ${CMAKE_CURRENT_SOURCE_DIR}
+            ${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
         DEPENDENCIES
             myriadPlugin
         LINK_LIBRARIES

diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp
index ef70cc9..131da10 100644 (file)
--- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp
+++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp
@@ -4,6 +4,7 @@
 
 #include "multi-device/multi_device_config.hpp"
 #include "vpu/vpu_plugin_config.hpp"
+#include "vpu/private_plugin_config.hpp"
 #include "behavior/config.hpp"
 
 using namespace BehaviorTestsDefinitions;

diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp
index 036e52c..81a26e0 100644 (file)
--- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp
+++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp
@@ -2,9 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include "behavior/infer_request_config.hpp"
+
 #include "multi-device/multi_device_config.hpp"
 #include "vpu/vpu_plugin_config.hpp"
-#include "behavior/infer_request_config.hpp"
+#include "vpu/private_plugin_config.hpp"
+#include "vpu/myriad_config.hpp"
 
 using namespace BehaviorTestsDefinitions;
 namespace {

diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
index cb8b6a5..c08f97b 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
+++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt
@@ -20,6 +20,14 @@ addIeTarget(
             ${CMAKE_CURRENT_SOURCE_DIR}/src
         ADD_CPPLINT
         DEVELOPER_PACKAGE
+        INCLUDES
+            PUBLIC
+                ${PUBLIC_HEADERS_DIR}
+        LINK_LIBRARIES
+            PUBLIC
+                ${EXPORT_DEPENDENCIES}
+            PRIVATE
+                inference_engine_transformations
         DEPENDENCIES
             mock_engine
             HeteroPlugin
@@ -34,17 +42,4 @@ ie_faster_build(${TARGET_NAME}
 
 if (TARGET MKLDNNPlugin)
     add_dependencies(${TARGET_NAME} MKLDNNPlugin)
-endif()
-
-target_include_directories(${TARGET_NAME} PUBLIC
-        ${PUBLIC_HEADERS_DIR}
-        ${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
-        )
-
-target_link_libraries(${TARGET_NAME}
-        PUBLIC
-        ${EXPORT_DEPENDENCIES}
-
-        PRIVATE
-        inference_engine_transformations
-        )
+endif()
\ No newline at end of file

diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp
index e1a83e5..31f6bdf 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/behavior/config.hpp
@@ -15,7 +15,6 @@
 #include "ngraph_functions/builders.hpp"
 #include <ie_plugin_config.hpp>
 #include <vpu/vpu_plugin_config.hpp>
-#include <vpu/private_plugin_config.hpp>
 #include <gna/gna_config.hpp>
 #include <multi-device/multi_device_config.hpp>
 #include <ie_core.hpp>

diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp
index 89eba10..984b194 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/behavior/infer_request_config.hpp
@@ -14,7 +14,6 @@
 #include "ngraph_functions/utils/ngraph_helpers.hpp"
 #include "ngraph_functions/builders.hpp"
 #include <vpu/vpu_plugin_config.hpp>
-#include <vpu/private_plugin_config.hpp>
 #include <gna/gna_config.hpp>
 #include <multi-device/multi_device_config.hpp>
 #include <ie_core.hpp>