From b805115c1a9f8d269d94c4e93af108c94192e2a6 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 29 Apr 2020 20:01:10 +0000 Subject: [PATCH] dnn(test): update skip tests on Win32 configuration --- modules/dnn/test/test_onnx_importer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dnn/test/test_onnx_importer.cpp b/modules/dnn/test/test_onnx_importer.cpp index d2a8010e9f..e0a4d4f665 100644 --- a/modules/dnn/test/test_onnx_importer.cpp +++ b/modules/dnn/test/test_onnx_importer.cpp @@ -534,7 +534,7 @@ public: TEST_P(Test_ONNX_nets, Alexnet) { -#if defined(OPENCV_32BIT_CONFIGURATION) && defined(HAVE_OPENCL) +#if defined(OPENCV_32BIT_CONFIGURATION) && (defined(HAVE_OPENCL) || defined(_WIN32)) applyTestTag(CV_TEST_TAG_MEMORY_2GB); #else applyTestTag(target == DNN_TARGET_CPU ? CV_TEST_TAG_MEMORY_512MB : CV_TEST_TAG_MEMORY_1GB); @@ -598,7 +598,7 @@ TEST_P(Test_ONNX_nets, Googlenet) TEST_P(Test_ONNX_nets, CaffeNet) { -#if defined(OPENCV_32BIT_CONFIGURATION) && defined(HAVE_OPENCL) +#if defined(OPENCV_32BIT_CONFIGURATION) && (defined(HAVE_OPENCL) || defined(_WIN32)) applyTestTag(CV_TEST_TAG_MEMORY_2GB); #else applyTestTag(target == DNN_TARGET_CPU ? CV_TEST_TAG_MEMORY_512MB : CV_TEST_TAG_MEMORY_1GB); @@ -614,7 +614,7 @@ TEST_P(Test_ONNX_nets, CaffeNet) TEST_P(Test_ONNX_nets, RCNN_ILSVRC13) { -#if defined(OPENCV_32BIT_CONFIGURATION) && defined(HAVE_OPENCL) +#if defined(OPENCV_32BIT_CONFIGURATION) && (defined(HAVE_OPENCL) || defined(_WIN32)) applyTestTag(CV_TEST_TAG_MEMORY_2GB); #else applyTestTag(target == DNN_TARGET_CPU ? CV_TEST_TAG_MEMORY_512MB : CV_TEST_TAG_MEMORY_1GB);