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

Merge pull request #5383 from alalek:fix_tests

Browse Source
This commit is contained in:
Alexander Alekhin 2015-09-22 12:11:22 +00:00
commit 21e38f2949
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ts/src/ts_perf.cpp
View File

@ -819,10 +819,8 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,
param_write_sanity = args.get<bool>("perf_write_sanity"); param_write_sanity = args.get<bool>("perf_write_sanity");
param_verify_sanity = args.get<bool>("perf_verify_sanity"); param_verify_sanity = args.get<bool>("perf_verify_sanity");
#ifndef WINRT #ifdef HAVE_IPP
test_ipp_check = !args.get<bool>("perf_ipp_check") ? getenv("OPENCV_IPP_CHECK") != NULL : true; test_ipp_check = !args.get<bool>("perf_ipp_check") ? getenv("OPENCV_IPP_CHECK") != NULL : true;
#else
test_ipp_check = false;
#endif #endif
param_threads = args.get<int>("perf_threads"); param_threads = args.get<int>("perf_threads");
#ifdef CV_COLLECT_IMPL_DATA #ifdef CV_COLLECT_IMPL_DATA
@ -916,7 +914,7 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,
if (!args.check()) if (!args.check())
{ {
args.printErrors(); args.printErrors();
return; exit();
} }
timeLimitDefault = param_time_limit == 0.0 ? 1 : (int64)(param_time_limit * cv::getTickFrequency()); timeLimitDefault = param_time_limit == 0.0 ? 1 : (int64)(param_time_limit * cv::getTickFrequency());