From 3316e5831414c61a89263470d9a615f9394da5cf Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 6 Aug 2015 13:52:35 +0300 Subject: [PATCH] more test loops (and disable tests - tests pass but require a lot of time) --- modules/core/test/test_umat.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp index 4b2b7c1a6d..98cb755a58 100644 --- a/modules/core/test/test_umat.cpp +++ b/modules/core/test/test_umat.cpp @@ -1029,14 +1029,14 @@ TEST(UMat, map_unmap_counting) ///////////// oclCleanupCallback threadsafe check (#5062) ///////////////////// // Case 1: reuse of old src Mat in OCL pipe. Hard to catch! -OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_1_VeryLongTest) +OCL_TEST(UMat, DISABLED_OCL_ThreadSafe_CleanupCallback_1_VeryLongTest) { if (!cv::ocl::useOpenCL()) { std::cout << "OpenCL is not enabled. Skip test" << std::endl; return; } - for (int j = 0; j < test_loop_times; j++) + for (int j = 0; j < 100; j++) { const Size srcSize(320, 240); const int type = CV_8UC1; @@ -1060,18 +1060,19 @@ OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_1_VeryLongTest) } EXPECT_MAT_NEAR(dst_ref, dst, 1); + printf(".\n"); fflush(stdout); } } // Case 2: concurent deallocation of UMatData between UMat and Mat deallocators. Hard to catch! -OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_2_VeryLongTest) +OCL_TEST(UMat, DISABLED_OCL_ThreadSafe_CleanupCallback_2_VeryLongTest) { if (!cv::ocl::useOpenCL()) { std::cout << "OpenCL is not enabled. Skip test" << std::endl; return; } - for (int j = 0; j < test_loop_times; j++) + for (int j = 0; j < 100; j++) { const Size srcSize(320, 240); const int type = CV_8UC1; @@ -1090,6 +1091,7 @@ OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_2_VeryLongTest) } ::cv::ocl::finish(); // force kernel to complete to start cleanup sooner } + printf(".\n"); fflush(stdout); } }