Merge pull request #110 from vpisarev/test_fixes2

This commit is contained in:
Andrey Kamaev 2012-10-31 16:52:50 +04:00
commit 3e10e057cb
3 changed files with 4 additions and 4 deletions

View File

@ -426,4 +426,4 @@ protected:
}
};
TEST(Calib3d_CalibrateCamera_CPP, accuracy_on_artificial_data) { CV_CalibrateCameraArtificialTest test; test.safe_run(); }
TEST(Calib3d_CalibrateCamera_CPP, DISABLED_accuracy_on_artificial_data) { CV_CalibrateCameraArtificialTest test; test.safe_run(); }

View File

@ -143,7 +143,7 @@ void CV_HighGuiTest::ImageTest(const string& dir)
#ifdef HAVE_JASPER
"jp2",
#endif
#if defined HAVE_OPENEXR && !defined __APPLE__
#if 0 /*defined HAVE_OPENEXR && !defined __APPLE__*/
"exr",
#endif
"bmp",

View File

@ -307,5 +307,5 @@ void LatentSVMDetectorTest::run( int /* start_from */)
ts->set_failed_test_info( cvtest::TS::OK);
}
TEST(Objdetect_LatentSVMDetector_c, regression) { CV_LatentSVMDetectorTest test; test.safe_run(); }
TEST(Objdetect_LatentSVMDetector_cpp, regression) { LatentSVMDetectorTest test; test.safe_run(); }
TEST(Objdetect_LatentSVMDetector_c, DISABLED_regression) { CV_LatentSVMDetectorTest test; test.safe_run(); }
TEST(Objdetect_LatentSVMDetector_cpp, DISABLED_regression) { LatentSVMDetectorTest test; test.safe_run(); }