Fixed logging in perf tests; small bugfix in run.py

diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp
index 12b9eed..0d5ef63 100644 (file)
--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -8,22 +8,23 @@
 #include "tbb/task_scheduler_init.h"\r
 #endif\r
 \r
-#if defined(ANDROID) && defined(USE_ANDROID_LOGGING)\r
-#include <android/log.h>\r
-\r
-#define PERF_TESTS_LOG_TAG "OpenCV_perf"\r
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
-#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
-#else\r
-#define LOGD(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
-#define LOGI(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
-#define LOGW(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
-#define LOGE(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
+#if !(defined(LOGD) || defined(LOGI) || defined(LOGW) || defined(LOGE))\r
+# if defined(ANDROID) && defined(USE_ANDROID_LOGGING)\r
+#  include <android/log.h>\r
+\r
+#  define PERF_TESTS_LOG_TAG "OpenCV_perf"\r
+#  define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
+#  define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
+#  define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
+#  define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, PERF_TESTS_LOG_TAG, __VA_ARGS__))\r
+# else\r
+#  define LOGD(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
+#  define LOGI(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
+#  define LOGW(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
+#  define LOGE(_str, ...) do{printf(_str , ## __VA_ARGS__); printf("\n");fflush(stdout);} while(0)\r
+# endif\r
 #endif\r
 \r
-\r
 namespace perf\r
 {\r
 \r

diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py
index 7b7979c..23dc3eb 100644 (file)
--- a/modules/ts/misc/run.py
+++ b/modules/ts/misc/run.py
@@ -433,7 +433,7 @@ class RunInfo(object):
         if len(userlog) == 0:
             args.append("--gtest_output=xml:" + logfile)
         else:
-            logfile = userlog[userlog[0].find(":")+1:]
+            logfile = userlog[0][userlog[0].find(":")+1:]
         
         if self.targetos == "android":
             try: