Updated command line arguments in performance tests

diff --git a/modules/core/perf/perf_core_arithm.cpp b/modules/core/perf/perf_core_arithm.cpp
index 7e48ca7..695cad3 100644 (file)
--- a/modules/core/perf/perf_core_arithm.cpp
+++ b/modules/core/perf/perf_core_arithm.cpp
@@ -61,7 +61,7 @@ PERF_TEST_P__CORE_ARITHM_SCALAR(add, TYPICAL_MATS_CORE_ARITHM)
 PERF_TEST_P__CORE_ARITHM_SCALAR(subtract, TYPICAL_MATS_CORE_ARITHM)
 PERF_TEST_P__CORE_ARITHM_SCALAR(absdiff, TYPICAL_MATS_CORE_ARITHM)
 
-
+#ifdef ANDROID
 PERF_TEST(convert, cvRound)
 {
     double number = theRNG().uniform(-100, 100);
@@ -74,4 +74,4 @@ PERF_TEST(convert, cvRound)
             result += cvRound(number);
     }
 }
-
+#endif

diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
index 145de3b..30be630 100644 (file)
--- a/modules/ts/src/ts_perf.cpp
+++ b/modules/ts/src/ts_perf.cpp
@@ -382,17 +382,17 @@ int64 TestBase::_timeadjustment = 0;
 \r
 const char *command_line_keys =\r
 {\r
-    "{!!bugbugbugbug!!   |perf_max_outliers   |8        |percent of allowed outliers}"\r
-    "{!!bugbugbugbug!!   |perf_min_samples    |10       |minimal required numer of samples}"\r
-    "{!!bugbugbugbug!!   |perf_seed           |809564   |seed for random numbers generator}"\r
+    "{   |perf_max_outliers   |8        |percent of allowed outliers}"\r
+    "{   |perf_min_samples    |10       |minimal required numer of samples}"\r
+    "{   |perf_seed           |809564   |seed for random numbers generator}"\r
     #if ANDROID\r
-    "{!!bugbugbugbug!!   |perf_time_limit     |6.0      |default time limit for a single test (in seconds)}"\r
-    "{!!bugbugbugbug!!   |perf_affinity_mask  |0        |set affinity mask for the main thread}"\r
+    "{   |perf_time_limit     |6.0      |default time limit for a single test (in seconds)}"\r
+    "{   |perf_affinity_mask  |0        |set affinity mask for the main thread}"\r
     #else\r
-    "{!!bugbugbugbug!!   |perf_time_limit     |3.0      |default time limit for a single test (in seconds)}"\r
+    "{   |perf_time_limit     |3.0      |default time limit for a single test (in seconds)}"\r
     #endif\r
-    "{!!bugbugbugbug!!   |perf_max_deviation  |1.0      |}"\r
-    "{h                  |help                |false    |}"\r
+    "{   |perf_max_deviation  |1.0      |}"\r
+    "{h  |help                |false    |}"\r
 };\r
 \r
 double       param_max_outliers;\r