Merge pull request #1314 from jet47:ts-gpu-fix

modules/ts/src/precomp.hpp

@@ -1,6 +1,7 @@
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"
 #include "opencv2/ts/ts.hpp"
+#include "cvconfig.h"
 
 #ifdef GTEST_LINKED_AS_SHARED_LIBRARY
 #error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined

modules/ts/src/ts_perf.cpp

@@ -741,6 +741,14 @@ void TestBase::RecordRunParameters()
 {
     ::testing::Test::RecordProperty("cv_implementation", param_impl);
     ::testing::Test::RecordProperty("cv_num_threads", param_threads);
+
+#ifdef HAVE_CUDA
+    if (param_impl == "cuda")
+    {
+        cv::gpu::DeviceInfo info(param_cuda_device);
+        ::testing::Test::RecordProperty("cv_cuda_gpu", info.name());
+    }
+#endif
 }
 
 std::string TestBase::getSelectedImpl()