nonfree perf tests

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"

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);