Merge pull request #1191 from jet47:gpu-perf4au-fix

d945b20d · Roman Donchenko · OpenCV Buildbot · be8b3687 · dfd29578 · d945b20d
Commit d945b20d authored Jul 26, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 26, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

main.cpp modules/gpu/perf4au/main.cpp +5 -9

No files found.
--- a/modules/gpu/perf4au/main.cpp
+++ b/modules/gpu/perf4au/main.cpp
@@ -55,16 +55,12 @@
 #include "opencv2/video/video.hpp"
 #include "opencv2/legacy/legacy.hpp"

-int main(int argc, char* argv[])
-{
-    perf::printCudaInfo();
-
-    perf::Regression::Init("gpu_perf4au");
-    perf::TestBase::Init(argc, argv);
-    testing::InitGoogleTest(&argc, argv);
+static const char * impls[] = {
+    "cuda",
+    "plain"
+};

-    return RUN_ALL_TESTS();
-}
+CV_PERF_TEST_MAIN_WITH_IMPLS(gpu_perf4au, impls, perf::printCudaInfo())

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