Merge pull request #1035 from SpecLad:cv-concurrency

diff --cc modules/ts/src/ts_func.cpp
index 9b6b535,0186e9c..38a2370
--- 1/modules/ts/src/ts_func.cpp
--- 2/modules/ts/src/ts_func.cpp
+++ b/modules/ts/src/ts_func.cpp
@@@ -2956,22 -2955,20 +2956,21 @@@ void printVersionInfo(bool useStdOut
      }
  
      pos1 = buildInfo.find("inner version");
 -    pos2 = buildInfo.find("\n", pos1);\
 +    pos2 = buildInfo.find('\n', pos1);
      if(pos1 != std::string::npos && pos2 != std::string::npos)
      {
 -        std::string ver( buildInfo.substr(pos1, pos2-pos1) );
 -        ::testing::Test::RecordProperty("inner_version", ver);
 -        if(useStdOut) std::cout << ver << std::endl;
 +        size_t value_start = buildInfo.rfind(' ', pos2) + 1;
 +        std::string ver( buildInfo.substr(value_start, pos2 - value_start) );
 +        ::testing::Test::RecordProperty("cv_inner_vcs_version", ver);
 +        if(useStdOut) std::cout << "Inner VCS version: " << ver << std::endl;
      }
  
- #ifdef CV_PARALLEL_FRAMEWORK
-     ::testing::Test::RecordProperty("cv_parallel_framework", CV_PARALLEL_FRAMEWORK);
-     if (useStdOut)
-     {
-         std::cout << "Parallel framework: " << CV_PARALLEL_FRAMEWORK << std::endl;
+     const char* parallel_framework = currentParallelFramework();
+ 
+     if (parallel_framework) {
+         ::testing::Test::RecordProperty("cv_parallel_framework", parallel_framework);
+         if (useStdOut) std::cout << "Parallel framework: " << parallel_framework << std::endl;
      }
- #endif
  
      std::string cpu_features;