Workaround issue with perf tests of Travis

Kirill Kornyakov · Kirill Kornyakov · commit cee1c26a5e18 · 2016-02-02T09:17:38.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,6 @@ script:
   # Run regression tests
   - ./bin/test_skeleton
   # Run performance tests
-  - ./bin/perf_skeleton --help
   - ./bin/perf_skeleton --gtest_output=xml:perf_report.xml
   # Print performance metrics
   - ../itseez-ws-2016-practice/3rdparty/opencv_ptest/misc/summary.py ./perf_report.xml
diff --git a/3rdparty/opencv_ptest/src/ts_perf.cpp b/3rdparty/opencv_ptest/src/ts_perf.cpp
@@ -678,6 +678,7 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,
     ::testing::AddGlobalTestEnvironment(new PerfEnvironment);
 
     param_impl          = args.get<bool>("perf_run_cpu") ? "plain" : args.get<std::string>("perf_impl");
+    //TODO(Kornyakov): for some reason default parameter doesn't match on Travis
     std::string perf_strategy = "default"; //args.get<std::string>("perf_strategy");
     if (perf_strategy == "default")
     {

Original file line number	Diff line number	Diff line change
`@@ -678,6 +678,7 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,`
`678`	`678`	`::testing::AddGlobalTestEnvironment(new PerfEnvironment);`
`679`	`679`
`680`	`680`	`param_impl = args.get<bool>("perf_run_cpu") ? "plain" : args.get<std::string>("perf_impl");`
	`681`	`+ //TODO(Kornyakov): for some reason default parameter doesn't match on Travis`
`681`	`682`	`std::string perf_strategy = "default"; //args.get<std::string>("perf_strategy");`
`682`	`683`	`if (perf_strategy == "default")`
`683`	`684`	`{`