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

Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing

Browse Source
This commit is contained in:
Roman Donchenko 2013-10-01 17:39:18 +04:00 committed by OpenCV Buildbot
commit 4d88a6e856
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ocl/perf/perf_bgfg.cpp
View File

@ -167,7 +167,7 @@ PERF_TEST_P(VideoMOGFixture, MOG,
typedef tuple<string, int> VideoMOG2ParamType;
typedef TestBaseWithParam<VideoMOG2ParamType> VideoMOG2Fixture;
PERF_TEST_P(VideoMOG2Fixture, MOG2,
PERF_TEST_P(VideoMOG2Fixture, DISABLED_MOG2, // TODO Disabled: random hungs on buildslave
::testing::Combine(::testing::Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"),
::testing::Values(1, 3)))
{

10
modules/ocl/perf/perf_matrix_operation.cpp
View File

@ -161,7 +161,7 @@ PERF_TEST_P(setToFixture, setTo,
typedef tuple<Size, int, int> uploadParams;
typedef TestBaseWithParam<uploadParams> uploadFixture;
PERF_TEST_P(uploadFixture, DISABLED_upload,
PERF_TEST_P(uploadFixture, upload,
testing::Combine(
OCL_TYPICAL_MAT_SIZES,
testing::Range(CV_8U, CV_64F),
@ -190,15 +190,14 @@ PERF_TEST_P(uploadFixture, DISABLED_upload,
else
OCL_PERF_ELSE
int value = 0;
SANITY_CHECK(value);
SANITY_CHECK_NOTHING();
}
/////////////////// download ///////////////////////////
typedef TestBaseWithParam<uploadParams> downloadFixture;
PERF_TEST_P(downloadFixture, DISABLED_download,
PERF_TEST_P(downloadFixture, download,
testing::Combine(
OCL_TYPICAL_MAT_SIZES,
testing::Range(CV_8U, CV_64F),
@ -227,6 +226,5 @@ PERF_TEST_P(downloadFixture, DISABLED_download,
else
OCL_PERF_ELSE
int value = 0;
SANITY_CHECK(value);
SANITY_CHECK_NOTHING();
}

4
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -209,6 +209,7 @@ private:
#define SANITY_CHECK(array, ...) ::perf::Regression::add(this, #array, array , ## __VA_ARGS__)
#define SANITY_CHECK_KEYPOINTS(array, ...) ::perf::Regression::addKeypoints(this, #array, array , ## __VA_ARGS__)
#define SANITY_CHECK_MATCHES(array, ...) ::perf::Regression::addMatches(this, #array, array , ## __VA_ARGS__)
#define SANITY_CHECK_NOTHING() this->setVerified();
class CV_EXPORTS GpuPerf
{
@ -345,12 +346,13 @@ private:
friend class TestBase;
};
friend class _declareHelper;
friend class Regression;
bool verified;
public:
_declareHelper declare;
void setVerified() { this->verified = true; }
};
template<typename T> class TestBaseWithParam: public TestBase, public ::testing::WithParamInterface<T> {};

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

@ -107,7 +107,7 @@ Regression& Regression::instance()
Regression& Regression::add(TestBase* test, const std::string& name, cv::InputArray array, double eps, ERROR_TYPE err)
{
if(test) test->verified = true;
if(test) test->setVerified();
return instance()(name, array, eps, err);
}