From 357a856cf68b6bb63f05f66ba9d7556f292913a8 Mon Sep 17 00:00:00 2001
From: Ilya Lavrenov <ilya.lavrenov@itseez.com>
Date: Thu, 13 Mar 2014 22:35:08 +0400
Subject: [PATCH] nonfree perf tests

---
 modules/nonfree/perf/perf_main.cpp     | 2 +-
 modules/nonfree/perf/perf_surf_ocl.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/nonfree/perf/perf_main.cpp b/modules/nonfree/perf/perf_main.cpp
index 03f9b71852..2cd609d414 100644
--- a/modules/nonfree/perf/perf_main.cpp
+++ b/modules/nonfree/perf/perf_main.cpp
@@ -5,7 +5,7 @@ static const char * impls[] = {
 #ifdef HAVE_CUDA
     "cuda",
 #endif
-#ifdef HAVE_OPENCL
+#ifdef HAVE_OPENCV_OCL
     "ocl",
 #endif
     "plain"
diff --git a/modules/nonfree/perf/perf_surf_ocl.cpp b/modules/nonfree/perf/perf_surf_ocl.cpp
index 4528b79268..8413ed072c 100644
--- a/modules/nonfree/perf/perf_surf_ocl.cpp
+++ b/modules/nonfree/perf/perf_surf_ocl.cpp
@@ -59,7 +59,7 @@ typedef perf::TestBaseWithParam<std::string> OCL_SURF;
 
 #define OCL_TEST_CYCLE() for( ; startTimer(), next(); cv::ocl::finish(), stopTimer())
 
-PERF_TEST_P(OCL_SURF, with_data_transfer, testing::Values(SURF_IMAGES))
+PERF_TEST_P(OCL_SURF, DISABLED_with_data_transfer, testing::Values(SURF_IMAGES))
 {
     string filename = getDataPath(GetParam());
     Mat src = imread(filename, IMREAD_GRAYSCALE);
@@ -94,7 +94,7 @@ PERF_TEST_P(OCL_SURF, with_data_transfer, testing::Values(SURF_IMAGES))
     SANITY_CHECK_NOTHING();
 }
 
-PERF_TEST_P(OCL_SURF, without_data_transfer, testing::Values(SURF_IMAGES))
+PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGES))
 {
     string filename = getDataPath(GetParam());
     Mat src = imread(filename, IMREAD_GRAYSCALE);