Merge pull request #2406 from ilya-lavrenov:abf

11 years ago · d695d4a0bf
parent 681a8c6e18 e1a598c5b3
commit d695d4a0bf
2 changed files with 2 additions and 2 deletions
--- a/modules/ocl/perf/perf_filters.cpp
+++ b/modules/ocl/perf/perf_filters.cpp
@ -381,7 +381,7 @@ PERF_TEST_P(BilateralFixture, Bilateral,

 typedef Size_MatType adaptiveBilateralFixture;

-PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral,
+PERF_TEST_P(adaptiveBilateralFixture, DISABLED_adaptiveBilateral,
            ::testing::Combine(::testing::Values(OCL_SIZE_1000), OCL_PERF_ENUM(CV_8UC1, CV_8UC3)))
 {
    const Size_MatType_t params = GetParam();
--- a/modules/ocl/test/test_filters.cpp
+++ b/modules/ocl/test/test_filters.cpp
@ -334,7 +334,7 @@ OCL_TEST_P(Bilateral, Mat)

 typedef FilterTestBase AdaptiveBilateral;

-OCL_TEST_P(AdaptiveBilateral, Mat)
+OCL_TEST_P(AdaptiveBilateral, DISABLED_Mat)
 {
    const Size kernelSize(ksize, ksize);