Backmerge tests openvinotoolkit#1

MirceaDan99 · May 17, 2024 · 105b4a0 · 105b4a0
1 parent 0206e3c
commit 105b4a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/plugins/intel_npu/tests/functional/behavior/infer_request_run.cpp b/src/plugins/intel_npu/tests/functional/behavior/infer_request_run.cpp
@@ -32,7 +32,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest_Driver, InferRequestRunTests,
 
 const std::vector<ov::AnyMap> batchingConfigs = {
         {ov::log::level(ov::log::Level::WARNING), ov::intel_npu::batch_mode(ov::intel_npu::BatchMode::COMPILER)},
-        {ov::log::level(ov::log::Level::WARNING), ov::intel_npu::batch_mode(ov::intel_npu::BatchMode::AUTO)}};
+        {ov::log::level(ov::log::Level::WARNING), ov::intel_npu::batch_mode(ov::intel_npu::BatchMode::AUTO)},
+        {ov::log::level(ov::log::Level::WARNING), ov::intel_npu::batch_mode(ov::intel_npu::BatchMode::PLUGIN)}};
 
 INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest_Driver, BatchingRunTests,
                          ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),

diff --git a/src/plugins/intel_npu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_npu/tests/functional/shared_tests_instances/skip_tests_config.cpp
@@ -528,10 +528,15 @@ std::vector<std::string> disabledTestPatterns() {
                                    ".*DriverCompilerAdapterInputsOutputsTestNPU.CheckInOutputs.*",
                                    ".*DriverCompilerAdapterExpectedThrowNPU.CheckWrongGraphExtAndThrow.*"});
 
+        _skipRegistry.addPatterns(devices.has3700() || !backendName.isZero(),
+                "Batching on plugin is not supported on 3700 platform or other backends besides Level Zero backend", {
+                ".*BatchingRunTests.*"
+        });
+
 #ifdef WIN32
 #elif defined(__linux__)
         // [Tracking number: E#103391]
-        _skipRegistry.addPatterns(backendName.isZero() && devices.has3720()),
+        _skipRegistry.addPatterns(backendName.isZero() && devices.has3720(),
                 "IfTest segfaults npuFuncTest on Ubuntu", {
                 ".*smoke_IfTest.*"
         });
@@ -606,7 +611,7 @@ std::vector<std::string> disabledTestPatterns() {
         });
 
         // [Tracking number: E#99817]
-        _skipRegistry.addPatterns(backendName.isZero() && devices.has3720()),
+        _skipRegistry.addPatterns(backendName.isZero() && devices.has3720(),
                 "Disabled tests for NPU3720", {
                 ".*InferRequestVariableStateTest.inferreq_smoke_VariableState_2infers.*",
                 ".*OVInferRequestIOTensorTest.*InferStaticNetworkSetChangedInputTensorThrow.*"