ocl: perf test: disable MOG2 (random hungs), enable upload/download

diff --git a/modules/ocl/perf/perf_bgfg.cpp b/modules/ocl/perf/perf_bgfg.cpp
index cd84509..3180f1b 100644 (file)
--- a/modules/ocl/perf/perf_bgfg.cpp
+++ b/modules/ocl/perf/perf_bgfg.cpp
@@ -167,7 +167,7 @@ PERF_TEST_P(VideoMOGFixture, MOG,
 typedef tuple<string, int> VideoMOG2ParamType;
 typedef TestBaseWithParam<VideoMOG2ParamType> VideoMOG2Fixture;
 
-PERF_TEST_P(VideoMOG2Fixture, MOG2,
+PERF_TEST_P(VideoMOG2Fixture, DISABLED_MOG2, // TODO Disabled: random hungs on buildslave
             ::testing::Combine(::testing::Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"),
             ::testing::Values(1, 3)))
 {

diff --git a/modules/ocl/perf/perf_matrix_operation.cpp b/modules/ocl/perf/perf_matrix_operation.cpp
index 13ce47a..8266f09 100644 (file)
--- a/modules/ocl/perf/perf_matrix_operation.cpp
+++ b/modules/ocl/perf/perf_matrix_operation.cpp
@@ -161,7 +161,7 @@ PERF_TEST_P(setToFixture, setTo,
 typedef tuple<Size, int, int> uploadParams;
 typedef TestBaseWithParam<uploadParams> uploadFixture;
 
-PERF_TEST_P(uploadFixture, DISABLED_upload,
+PERF_TEST_P(uploadFixture, upload,
             testing::Combine(
                 OCL_TYPICAL_MAT_SIZES,
                 testing::Range(CV_8U, CV_64F),
@@ -190,15 +190,14 @@ PERF_TEST_P(uploadFixture, DISABLED_upload,
     else
         OCL_PERF_ELSE
 
-    int value = 0;
-    SANITY_CHECK(value);
+    SANITY_CHECK_NOTHING();
 }
 
 /////////////////// download ///////////////////////////
 
 typedef TestBaseWithParam<uploadParams> downloadFixture;
 
-PERF_TEST_P(downloadFixture, DISABLED_download,
+PERF_TEST_P(downloadFixture, download,
             testing::Combine(
                 OCL_TYPICAL_MAT_SIZES,
                 testing::Range(CV_8U, CV_64F),
@@ -227,6 +226,5 @@ PERF_TEST_P(downloadFixture, DISABLED_download,
     else
         OCL_PERF_ELSE
 
-    int value = 0;
-    SANITY_CHECK(value);
+    SANITY_CHECK_NOTHING();
 }