Compare commits

...

3 Commits

Author SHA1 Message Date
Jean-Philippe Andre 2ca7eec032 UI main loop: Fix indentation 2014-10-22 16:08:24 +09:00
Jean-Philippe Andre 474cf5c88b Fix support of --count from command line
expedite would never exit after N loops
2014-10-22 15:59:03 +09:00
Cedric BAIL c6353fc5e1 fix wrong ordering of report. 2014-09-04 14:20:56 +02:00
3 changed files with 29 additions and 25 deletions

View File

@ -9,6 +9,7 @@ const char *profile = "n800";
const char *choosen_engine = NULL;
int win_w = 720, win_h = 420;
int loops = LOOPS;
int one_test = 0;
Eina_Bool fullscreen = EINA_FALSE;
Eina_Bool cmp_report = EINA_FALSE;
@ -1322,6 +1323,7 @@ main(int argc, char **argv)
}
else if (test > 0)
{
one_test = 1;
ui_num(test);
}

View File

@ -47,6 +47,7 @@ extern "C"
extern Evas *evas;
extern int win_w, win_h;
extern int loops;
extern int one_test;
extern const char *choosen_engine;
extern Eina_Bool fullscreen;
extern Eina_Bool cmp_report;
@ -92,8 +93,8 @@ int engine_abort(void);
{ \
double fps; \
fps = (double)f / t; \
ui_fps(fps); \
printf("%4.2f , %s\n", fps, x); \
ui_fps(fps); \
done = 1; \
}

View File

@ -514,6 +514,7 @@ ui_num(int n)
if (!mi->test)
return;
menu_sel = n;
if (one_test) test_item = menu_sel;
_ui_select();
}
}
@ -724,7 +725,7 @@ ui_fps(double fps)
test_item++;
mi = eina_list_nth(menu, test_item);
if (!mi->test)
if (one_test || !mi->test)
{
char datestr[1024];
struct tm *tim;
@ -766,29 +767,29 @@ ui_fps(double fps)
loops,
choosen_engine,
fullscreen);
else
printf("\n#####Test Result#####\n"
"evas fps speed: %5.2f\n"
"evas fps speed(weighted): %5.2f\n"
"testcase count: %i\n"
"date: %s\n"
"evas version: %i.%i.%i.%i\n"
"profile: %s\n"
"window size: %i, %i\n"
"loop count: %i\n"
"engine: %s\n"
"full screen: %i\n",
(fps / t_count),
(wfps / avgw) / t_count,
t_count,
datestr,
evas_version->major, evas_version->minor, evas_version->micro,
evas_version->revision,
profile,
win_w, win_h,
loops,
choosen_engine,
fullscreen);
else
printf("\n#####Test Result#####\n"
"evas fps speed: %5.2f\n"
"evas fps speed(weighted): %5.2f\n"
"testcase count: %i\n"
"date: %s\n"
"evas version: %i.%i.%i.%i\n"
"profile: %s\n"
"window size: %i, %i\n"
"loop count: %i\n"
"engine: %s\n"
"full screen: %i\n",
(fps / t_count),
(wfps / avgw) / t_count,
t_count,
datestr,
evas_version->major, evas_version->minor, evas_version->micro,
evas_version->revision,
profile,
win_w, win_h,
loops,
choosen_engine,
fullscreen);
ecore_main_loop_quit();
}