updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request

modules/nonfree/test/test_features2d.cpp

@@ -991,7 +991,7 @@ TEST( Features2d_DescriptorExtractor_SIFT, regression )
     test.safe_run();
 }
 
-TEST( Features2d_DescriptorExtractor_SURF, DISABLED_regression )
+TEST( Features2d_DescriptorExtractor_SURF, regression )
 {
     CV_DescriptorExtractorTest<L2<float> > test( "descriptor-surf",  0.05f,
                                                  DescriptorExtractor::create("SURF") );
@@ -1005,7 +1005,7 @@ TEST( Features2d_DescriptorExtractor_OpponentSIFT, regression )
     test.safe_run();
 }
 
-TEST( Features2d_DescriptorExtractor_OpponentSURF, DISABLED_regression )
+TEST( Features2d_DescriptorExtractor_OpponentSURF, regression )
 {
     CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-surf",  0.3f,
                                                  DescriptorExtractor::create("OpponentSURF") );

modules/ocl/perf/precomp.hpp

@@ -55,13 +55,13 @@
 #include "cvconfig.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
-//#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/video/video.hpp"
 #include "opencv2/ts/ts.hpp"
 #include "opencv2/ts/ts_perf.hpp"
 #include "opencv2/ocl/ocl.hpp"
-//#include "opencv2/nonfree/nonfree.hpp"
+#include "opencv2/nonfree/nonfree.hpp"
 
 #include "utility.hpp"
 #include "interpolation.hpp"

modules/ocl/test/precomp.hpp

@@ -55,13 +55,13 @@
 #include "cvconfig.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
-//#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/video/video.hpp"
 #include "opencv2/ts/ts.hpp"
 #include "opencv2/ts/ts_perf.hpp"
 #include "opencv2/ocl/ocl.hpp"
-//#include "opencv2/nonfree/nonfree.hpp"
+#include "opencv2/nonfree/nonfree.hpp"
 
 #include "utility.hpp"
 #include "interpolation.hpp"

modules/photo/test/test_denoising.cpp

@@ -76,7 +76,7 @@ TEST(Imgproc_DenoisingGrayscale, regression)
     ASSERT_EQ(0, norm(result != expected));
 }
 
-TEST(Imgproc_DenoisingColored, DISABLED_regression)
+TEST(Imgproc_DenoisingColored, regression)
 {
     string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/";
     string original_path = folder + "lena_noised_gaussian_sigma=10.png";
@@ -121,7 +121,7 @@ TEST(Imgproc_DenoisingGrayscaleMulti, regression)
     ASSERT_EQ(0, norm(result != expected));
 }
 
-TEST(Imgproc_DenoisingColoredMulti, DISABLED_regression)
+TEST(Imgproc_DenoisingColoredMulti, regression)
 {
     const int imgs_count = 3;
     string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/";