summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-11-29 07:01:54 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-11-29 07:01:54 +0000
commit1477f6b15598ca8ce760fb653de1102c0ee2313e (patch)
tree57cae9fab64d789c47889f2a88b19a60b4e561ab /src
parent5e69c24b6e292eeac3a1a3a1d5a01e4178adc9c7 (diff)
expedite: add back a expedite-cmp parsable output.
SVN revision: 79816
Diffstat (limited to 'src')
-rw-r--r--src/bin/main.c1
-rw-r--r--src/bin/ui.c72
2 files changed, 51 insertions, 22 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index 25b274a..1c83299 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1236,6 +1236,7 @@ _help(void)
1236 " -t TEST-NUM\n" 1236 " -t TEST-NUM\n"
1237 " -e ENGINE\n" 1237 " -e ENGINE\n"
1238 " -p PROFILE\n" 1238 " -p PROFILE\n"
1239 " -m (expedite-cmp compliant output)\n"
1239 " -f use netwm fullscreen request (requires x11 + wm)\n" 1240 " -f use netwm fullscreen request (requires x11 + wm)\n"
1240 "\n" 1241 "\n"
1241 "Where ENGINE can be one of:\n"); 1242 "Where ENGINE can be one of:\n");
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 045efe6..b0063fc 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -222,6 +222,7 @@ extern int win_w, win_h;
222extern const char *engine; 222extern const char *engine;
223extern int loops; 223extern int loops;
224extern int fullscreen; 224extern int fullscreen;
225static int cmp_report = 0;
225 226
226static void 227static void
227_ui_all(void) 228_ui_all(void)
@@ -280,28 +281,51 @@ _ui_all(void)
280 tim = localtime(&now); 281 tim = localtime(&now);
281 if (tim) strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tim); 282 if (tim) strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tim);
282 else snprintf(datestr, sizeof(datestr), "unknown"); 283 else snprintf(datestr, sizeof(datestr), "unknown");
283 printf("\n#####Test Result#####\n" 284 // printf("%5.2f , EVAS SPEED\n", fps / t_count);
284 "evas fps speed: %5.2f\n" 285 if (cmp_report)
285 "evas fps speed(weighted): %5.2f\n" 286 printf("%5.2f , EVAS SPEED (WEIGHTED), "
286 "testcase count: %i\n" 287 "tn, %i , "
287 "date: %s\n" 288 "t, %s , "
288 "evas version: %i.%i.%i.%i\n" 289 "ev , %i.%i.%i.%i , "
289 "profile: %s\n" 290 "p , %s , "
290 "window size: %i, %i\n" 291 "sz , %i , %i , "
291 "loop count: %i\n" 292 "c , %i , "
292 "engine: %s\n" 293 "e , %s , "
293 "full screen: %i\n", 294 "fs , %i\n"
294 (fps / t_count), 295 ,
295 (wfps / avgw) / t_count, 296 wfps / (t_count * avgw),
296 t_count, 297 // fps / t_count,
297 datestr, 298 t_count,
298 evas_version->major, evas_version->minor, evas_version->micro, 299 datestr,
299 evas_version->revision, 300 evas_version->major, evas_version->minor, evas_version->micro, evas_version->revision,
300 profile, 301 profile,
301 win_w, win_h, 302 win_w, win_h,
302 loops, 303 loops,
303 engine, 304 engine,
304 fullscreen); 305 fullscreen);
306 else
307 printf("\n#####Test Result#####\n"
308 "evas fps speed: %5.2f\n"
309 "evas fps speed(weighted): %5.2f\n"
310 "testcase count: %i\n"
311 "date: %s\n"
312 "evas version: %i.%i.%i.%i\n"
313 "profile: %s\n"
314 "window size: %i, %i\n"
315 "loop count: %i\n"
316 "engine: %s\n"
317 "full screen: %i\n",
318 (fps / t_count),
319 (wfps / avgw) / t_count,
320 t_count,
321 datestr,
322 evas_version->major, evas_version->minor, evas_version->micro,
323 evas_version->revision,
324 profile,
325 win_w, win_h,
326 loops,
327 engine,
328 fullscreen);
305 } 329 }
306} 330}
307 331
@@ -670,6 +694,10 @@ ui_args(int argc, char **argv)
670 { 694 {
671 list_test = 1; 695 list_test = 1;
672 } 696 }
697 else if (!strcmp(argv[i], "-m"))
698 {
699 cmp_report = 1;
700 }
673 } 701 }
674 _ui_setup(); 702 _ui_setup();
675 start = get_time(); 703 start = get_time();