generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1026 from SpecLad:ts-version-prop

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-21 18:00:59 +04:00 committed by OpenCV Buildbot
commit 5fa200763f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/ts/src/ts_func.cpp
View File

@ -2940,27 +2940,29 @@ MatComparator::operator()(const char* expr1, const char* expr2,
void printVersionInfo(bool useStdOut) void printVersionInfo(bool useStdOut)
{ {
::testing::Test::RecordProperty("CV_VERSION", CV_VERSION); ::testing::Test::RecordProperty("cv_version", CV_VERSION);
if(useStdOut) std::cout << "OpenCV version: " << CV_VERSION << std::endl; if(useStdOut) std::cout << "OpenCV version: " << CV_VERSION << std::endl;
std::string buildInfo( cv::getBuildInformation() ); std::string buildInfo( cv::getBuildInformation() );
size_t pos1 = buildInfo.find("Version control"); size_t pos1 = buildInfo.find("Version control");
size_t pos2 = buildInfo.find("\n", pos1);\ size_t pos2 = buildInfo.find('\n', pos1);
if(pos1 != std::string::npos && pos2 != std::string::npos) if(pos1 != std::string::npos && pos2 != std::string::npos)
{ {
std::string ver( buildInfo.substr(pos1, pos2-pos1) ); size_t value_start = buildInfo.rfind(' ', pos2) + 1;
::testing::Test::RecordProperty("Version_control", ver); std::string ver( buildInfo.substr(value_start, pos2 - value_start) );
if(useStdOut) std::cout << ver << std::endl; ::testing::Test::RecordProperty("cv_vcs_version", ver);
if (useStdOut) std::cout << "OpenCV VCS version: " << ver << std::endl;
} }
pos1 = buildInfo.find("inner version"); pos1 = buildInfo.find("inner version");
pos2 = buildInfo.find("\n", pos1);\ pos2 = buildInfo.find('\n', pos1);
if(pos1 != std::string::npos && pos2 != std::string::npos) if(pos1 != std::string::npos && pos2 != std::string::npos)
{ {
std::string ver( buildInfo.substr(pos1, pos2-pos1) ); size_t value_start = buildInfo.rfind(' ', pos2) + 1;
::testing::Test::RecordProperty("inner_version", ver); std::string ver( buildInfo.substr(value_start, pos2 - value_start) );
if(useStdOut) std::cout << ver << std::endl; ::testing::Test::RecordProperty("cv_inner_vcs_version", ver);
if(useStdOut) std::cout << "Inner VCS version: " << ver << std::endl;
} }
#ifdef CV_PARALLEL_FRAMEWORK #ifdef CV_PARALLEL_FRAMEWORK