提交 445f44c1 编写于 作者: A Alexander Shishkov

Move failed tests to corresponding blacklists

上级 387f2040
......@@ -795,7 +795,7 @@ void CV_CameraCalibrationTest_CPP::project( int pointCount, CvPoint3D64f* _objec
}
}
//CV_CameraCalibrationTest_CPP calibrate_test_cpp;
CV_CameraCalibrationTest_CPP calibrate_test_cpp;
//----------------------------------------- CV_CalibrationMatrixValuesTest --------------------------------
......@@ -1656,7 +1656,7 @@ bool CV_StereoCalibrationTest_C::rectifyUncalibrated( const Mat& points1,
return cvStereoRectifyUncalibrated(&_pt1, &_pt2, pF, imgSize, &_H1, &_H2, threshold) > 0;
}
//CV_StereoCalibrationTest_C stereocalib_test_c;
CV_StereoCalibrationTest_C stereocalib_test_c;
//-------------------------------- CV_StereoCalibrationTest_CPP ------------------------------
......
......@@ -425,4 +425,4 @@ protected:
}
};
//CV_CalibrateCameraArtificialTest calibrateCameraArtificialTest;
CV_CalibrateCameraArtificialTest calibrateCameraArtificialTest;
......@@ -383,7 +383,7 @@ _exit_:
}
//CV_CamShiftTest camshift_test;
CV_CamShiftTest camshift_test;
///////////////////////// MeanShift //////////////////////////////
......
......@@ -465,5 +465,5 @@ int CV_HOGDetectorTest::detectMultiScale( int di, const Mat& img,
return CvTS::OK;
}
//CV_CascadeDetectorTest cascadeTest("cascade-detector");
//CV_HOGDetectorTest hogTest("hog-detector");
CV_CascadeDetectorTest cascadeTest("cascade-detector");
CV_HOGDetectorTest hogTest("hog-detector");
......@@ -408,6 +408,6 @@ bool CV_ChessboardDetectorTest::checkByGenerator()
return res;
}
//CV_ChessboardDetectorTest chessboard_detector_test;
CV_ChessboardDetectorTest chessboard_detector_test;
/* End of file. */
......@@ -1375,7 +1375,7 @@ void CV_ColorLuvTest::convert_row_abc2bgr_32f_c3( const float* src_row, float* d
}
//CV_ColorLuvTest color_luv_test;
CV_ColorLuvTest color_luv_test;
......
......@@ -789,7 +789,7 @@ _exit_:
}
//CV_MinAreaRectTest shape_minarearect_test;
CV_MinAreaRectTest shape_minarearect_test;
/****************************************************************************************\
......
......@@ -240,6 +240,6 @@ void CV_ChessboardSubpixelTest::generateIntrinsicParams()
distortion_coeffs_ = (Mat_<double>(1, 5) << k1, k2, p1, p2, k3);
}
//CV_ChessboardSubpixelTest chessboard_subpixel_test;
CV_ChessboardSubpixelTest chessboard_subpixel_test;
/* End of file. */
......@@ -172,5 +172,5 @@ void CV_RigidTransform_Test::run( int start_from )
ts->set_failed_test_info(CvTS::OK);
}
//CV_RigidTransform_Test CV_RigidTransform_test;
CV_RigidTransform_Test CV_RigidTransform_test;
......@@ -172,7 +172,7 @@ CV_FeatureDetectorTest harrisTest( "detector_harris", createFeatureDetector("HAR
CV_FeatureDetectorTest mserTest( "detector_mser", createFeatureDetector("MSER") );
CV_FeatureDetectorTest siftTest( "detector_sift", createFeatureDetector("SIFT") );
CV_FeatureDetectorTest starTest( "detector_star", createFeatureDetector("STAR") );
//CV_FeatureDetectorTest surfTest( "detector_surf", createFeatureDetector("SURF") );
CV_FeatureDetectorTest surfTest( "detector_surf", createFeatureDetector("SURF") );
/****************************************************************************************\
* Regression tests for descriptor extractors. *
......@@ -320,10 +320,10 @@ public:
}
};
//CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_sift", 0.001f,
// createDescriptorExtractor("SIFT"), 8.06652f );
//CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_surf", 0.004f,
// createDescriptorExtractor("SURF"), 0.147372f );
CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_sift", 0.001f,
createDescriptorExtractor("SIFT"), 8.06652f );
CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_surf", 0.004f,
createDescriptorExtractor("SURF"), 0.147372f );
//CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_opponent_sift", 0.001f,
// createDescriptorExtractor("OpponentSIFT"), 8.06652f );
//CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_opponent_surf", 0.004f,
......
......@@ -1096,7 +1096,7 @@ void CV_FundamentalMatTest::prepare_to_validation( int test_case_idx )
}
//CV_FundamentalMatTest fmatrix_test;
CV_FundamentalMatTest fmatrix_test;
/********************************** convert homogeneous *********************************/
......
......@@ -1569,7 +1569,7 @@ int CV_CalcBackProjectTest::validate_test_results( int /*test_case_idx*/ )
}
//CV_CalcBackProjectTest hist_backproj_test;
CV_CalcBackProjectTest hist_backproj_test;
////////////// cvCalcBackProjectPatch //////////////
......
......@@ -426,7 +426,7 @@ void CV_ResizeTest::prepare_to_validation( int /*test_case_idx*/ )
cvReleaseMat( &y_idx );
}
//CV_ResizeTest warp_resize_test;
CV_ResizeTest warp_resize_test;
/////////////////////////
......@@ -753,7 +753,7 @@ void CV_WarpAffineTest::prepare_to_validation( int /*test_case_idx*/ )
}
//CV_WarpAffineTest warp_affine_test;
CV_WarpAffineTest warp_affine_test;
......@@ -965,7 +965,7 @@ void CV_WarpPerspectiveTest::prepare_to_validation( int /*test_case_idx*/ )
}
//CV_WarpPerspectiveTest warp_perspective_test;
CV_WarpPerspectiveTest warp_perspective_test;
......@@ -1191,7 +1191,7 @@ void CV_RemapTest::prepare_to_validation( int /*test_case_idx*/ )
}
//CV_RemapTest remap_test;
CV_RemapTest remap_test;
////////////////////////////// undistort /////////////////////////////////
......@@ -1435,7 +1435,7 @@ void CV_UndistortTest::prepare_to_validation( int /*test_case_idx*/ )
}
//CV_UndistortTest undistort_test;
CV_UndistortTest undistort_test;
......
......@@ -635,5 +635,5 @@ int CV_MHIGlobalOrientTest::validate_test_results( int test_case_idx )
}
//CV_MHIGlobalOrientTest mhi_global_orient_test;
CV_MHIGlobalOrientTest mhi_global_orient_test;
......@@ -198,4 +198,4 @@ void CV_MserTest::run(int)
cvReleaseImage(&img);
}
//CV_MserTest mser_test;
CV_MserTest mser_test;
......@@ -216,6 +216,6 @@ _exit_:
ts->set_failed_test_info( code );
}
//CV_POSITTest posit_test;
CV_POSITTest posit_test;
/* End of file. */
......@@ -194,6 +194,6 @@ _exit_:
ts->set_failed_test_info( code );
}
//CV_PyrSegmentationTest pyr_segmentation_test;
CV_PyrSegmentationTest pyr_segmentation_test;
/* End of file. */
......@@ -767,7 +767,7 @@ protected:
};
//CV_StereoGCTest stereoGC;
CV_StereoGCTest stereoGC;
//----------------------------------- StereoSGBM test -----------------------------------------------------
......
......@@ -293,7 +293,7 @@ _exit_:
return code;
}
//CV_SubdivTest subdiv_test;
CV_SubdivTest subdiv_test;
/* End of file. */
......@@ -119,4 +119,4 @@ void CV_InpaintTest::run( int )
ts->set_failed_test_info(CvTS::OK);
}
//CV_InpaintTest inpaint_test;
CV_InpaintTest inpaint_test;
......@@ -45,10 +45,38 @@ CvTS test_system("cv");
const char* blacklist[] =
{
"morph-ex",
"operations",
"stereobm",
"stereosgbm",
"morph-ex", //ticket 612
"operations", //ticket 613
"stereobm", //ticket 614
"stereosgbm", //ticket 615
"cascade-detector", //ticket 432
"hog-detector", //ticket 428
"warp-resize", //ticket 429
"posit", //ticket 430
"optflow-estimate-rigid", //ticket 433
"shape-minarearect", //ticket 436
"MSER", //ticket 437
"stereogc", //ticket 439
"subdiv", //ticket 454
"mhi-global", //ticket 457
"segmentation-pyramid", //ticket 464
"calibrate-camera-artificial", //ticket 472
"chessboard-subpixel", //ticket 473
"track-camshift", //ticket 483
"_3d-fundam", //ticket 484
"color-luv", //ticket 502
"calibrate-camera-cpp", //ticket 564
"calibrate-stereo-c", //ticket 565
"descriptor_sift", //ticket 567
"descriptor_surf", //ticket 568
"chessboard-detector", //ticket 569
"inpaint", //ticket 570
"warp-affine", //ticket 572
"warp-perspective", //ticket 575
"warp-remap", //ticket 576
"warp-undistort", //ticket 577
"detector_surf", //ticket 578
"hist-backproj", //ticket 579
0
};
......
......@@ -2333,6 +2333,6 @@ void CxCore_GraphScanTest::run( int )
cvReleaseMat( &edge_mask );
}
//CxCore_GraphScanTest graphscan_test;
CxCore_GraphScanTest graphscan_test;
/* End of file. */
......@@ -2618,7 +2618,7 @@ void CxCore_InvertTest::prepare_to_validation( int )
cvTsSetIdentity( &test_mat[REF_OUTPUT][0], cvScalarAll(1.) );
}
//CxCore_InvertTest invert_test;
CxCore_InvertTest invert_test;
///////////////// solve /////////////////////
......
......@@ -305,4 +305,4 @@ exit_func:
#endif
//CV_PCATest pca_test;
CV_PCATest pca_test;
......@@ -45,7 +45,10 @@ CvTS test_system("core");
const char* blacklist[] =
{
//"matrix-invert",
"matrix-dotproduct", //ticket 447
"ds-graphscan", //ticket 504
"matrix-invert", //ticket 536
"pca", //ticket 566
0
};
......
......@@ -116,8 +116,8 @@ int CV_AMLTest::validate_test_results( int testCaseIdx )
}
CV_AMLTest amldtree( CV_DTREE, "adtree" );
//CV_AMLTest amlboost( CV_BOOST, "aboost" );
//CV_AMLTest amlrtrees( CV_RTREES, "artrees" );
CV_AMLTest amlboost( CV_BOOST, "aboost" );
CV_AMLTest amlrtrees( CV_RTREES, "artrees" );
//CV_AMLTest amlertrees( CV_ERTREES, "aertrees" );
/* End of file. */
......@@ -45,7 +45,9 @@ CvTS test_system("ml");
const char* blacklist[] =
{
"kmeans",
"kmeans", //ticket 616
"artrees", //ticket 460
"aboost", //ticket 474
0
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册