Merge pull request #1122 from SpecLad:merge-2.4

This commit is contained in:
Andrey Pavlenko
2013-07-21 18:46:26 +04:00
committed by OpenCV Buildbot
32 changed files with 2342 additions and 88 deletions

View File

@@ -551,6 +551,13 @@ int main(int argc, char **argv) \
return RUN_ALL_TESTS(); \
}
// This usually only makes sense in perf tests with several implementations,
// some of which are not available.
#define CV_TEST_FAIL_NO_IMPL() do { \
::testing::Test::RecordProperty("custom_status", "noimpl"); \
FAIL() << "No equivalent implementation."; \
} while (0)
#endif
#include "opencv2/ts/ts_perf.hpp"