Merge pull request #1095 from jet47:gpu-perf-tests

2013-07-18 19:32:37 +04:00
parent 77f2d945f0 4716f63444
commit 0386488629
14 changed files with 45 additions and 29 deletions
--- a/modules/gpu/perf4au/main.cpp
+++ b/modules/gpu/perf4au/main.cpp
@@ -52,16 +52,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"

-int main(int argc, char* argv[])
-{
-    perf::printCudaInfo();
-
-    perf::Regression::Init("gpu_perf4au");
-    perf::TestBase::Init(argc, argv);
-    testing::InitGoogleTest(&argc, argv);
-
-    return RUN_ALL_TESTS();
-}
+CV_PERF_TEST_CUDA_MAIN(gpu_perf4au)

 //////////////////////////////////////////////////////////
 // HoughLinesP