diff --git a/modules/nonfree/test/test_features2d.cpp b/modules/nonfree/test/test_features2d.cpp index 41317ef09f..eb8f44b8d3 100644 --- a/modules/nonfree/test/test_features2d.cpp +++ b/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 > 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 > test( "descriptor-opponent-surf", 0.3f, DescriptorExtractor::create("OpponentSURF") ); diff --git a/modules/ocl/perf/precomp.hpp b/modules/ocl/perf/precomp.hpp index b3c540d62a..cad26fc8de 100644 --- a/modules/ocl/perf/precomp.hpp +++ b/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" diff --git a/modules/ocl/test/precomp.hpp b/modules/ocl/test/precomp.hpp index 3f6514f91f..b9b228e6ee 100644 --- a/modules/ocl/test/precomp.hpp +++ b/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" diff --git a/modules/photo/test/test_denoising.cpp b/modules/photo/test/test_denoising.cpp index 3ae4564f00..7312bbbafa 100644 --- a/modules/photo/test/test_denoising.cpp +++ b/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/";