Enabled all tests.

23 files changed, 138 insertions, 117 deletions

diff --git a/src/bin/cxx/proxy_text_fixed.cc b/src/bin/cxx/proxy_text_fixed.cc
index 0f6cc67..9d87d89 100644
--- a/src/bin/cxx/proxy_text_fixed.cc
+++ b/src/bin/cxx/proxy_text_fixed.cc
@@ -94,7 +94,8 @@ static void _loop(double t, int f)
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index 6fa498d..8e2f874 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -73,3 +73,8 @@ static void _key(char *key)
    KEY_STD;
 }
 
+extern "C" void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
diff --git a/src/bin/cxx/tests.h b/src/bin/cxx/tests.h
index 5304802..a0d524e 100644
--- a/src/bin/cxx/tests.h
+++ b/src/bin/cxx/tests.h
@@ -3,100 +3,100 @@
 extern "C" {
 #endif
 
-/* #include "font_effect_blur_alpha_capi.h" */
+#include "font_effect_blur_alpha_capi.h"
 #include "image_blend_border_capi.h"
 #include "image_blend_border_recolor_capi.h"
 #include "image_blend_fade_pow2_unscaled_capi.h"
 #include "image_blend_fade_unscaled_capi.h"
-/* #include "image_blend_many_smooth_same_scaled_capi.h" */
-/* #include "image_blend_nearest_same_scaled_capi.h" */
-/* #include "image_blend_nearest_scaled_capi.h" */
-/* #include "image_blend_nearest_solid_same_scaled_capi.h" */
-/* #include "image_blend_nearest_solid_scaled_capi.h" */
-/* #include "image_blend_occlude1_capi.h" */
-/* #include "image_blend_occlude1_few_capi.h" */
-/* #include "image_blend_occlude1_many_capi.h" */
-/* #include "image_blend_occlude1_very_many_capi.h" */
-/* #include "image_blend_occlude2_capi.h" */
-/* #include "image_blend_occlude2_few_capi.h" */
-/* #include "image_blend_occlude2_many_capi.h" */
-/* #include "image_blend_occlude2_very_many_capi.h" */
-/* #include "image_blend_occlude3_capi.h" */
-/* #include "image_blend_occlude3_few_capi.h" */
-/* #include "image_blend_occlude3_many_capi.h" */
-/* #include "image_blend_occlude3_very_many_capi.h" */
-/* #include "image_blend_smooth_same_scaled_capi.h" */
-/* #include "image_blend_smooth_scaled_capi.h" */
-/* #include "image_blend_smooth_solid_same_scaled_capi.h" */
-/* #include "image_blend_smooth_solid_scaled_capi.h" */
-/* #include "image_blend_solid_border_capi.h" */
-/* #include "image_blend_solid_fade_pow2_unscaled_capi.h" */
-/* #include "image_blend_solid_fade_unscaled_capi.h" */
-/* #include "image_blend_solid_middle_border_capi.h" */
-/* #include "image_blend_solid_middle_unscaled_capi.h" */
-/* #include "image_blend_solid_unscaled_capi.h" */
-/* #include "image_blend_unscaled_capi.h" */
-/* #include "image_crossfade_capi.h" */
-/* #include "image_data_argb_alpha_capi.h" */
-/* #include "image_data_argb_capi.h" */
-/* #include "image_data_ycbcr601pl_capi.h" */
-/* #include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h" */
-/* #include "image_data_ycbcr601pl_map_solid_rotate_capi.h" */
-/* #include "image_data_ycbcr601pl_wide_stride_capi.h" */
-/* #include "image_map_3d_1_capi.h" */
-/* #include "image_map_3d_2_capi.h" */
-/* #include "image_map_3d_3_capi.h" */
-/* #include "image_map_3d_4_capi.h" */
-/* #include "image_map_3d_5_capi.h" */
-/* #include "image_map_3d_6_capi.h" */
-/* #include "image_map_3d_flow_capi.h" */
-/* #include "image_map_color_alpha_nearest_rotate_capi.h" */
-/* #include "image_map_color_alpha_nearest_solid_rotate_capi.h" */
-/* #include "image_map_color_alpha_rotate_capi.h" */
-/* #include "image_map_color_alpha_solid_rotate_capi.h" */
-/* #include "image_map_color_nearest_rotate_capi.h" */
-/* #include "image_map_color_nearest_solid_rotate_capi.h" */
-/* #include "image_map_color_rotate_capi.h" */
-/* #include "image_map_color_solid_rotate_capi.h" */
-/* #include "image_map_nearest_rotate_capi.h" */
-/* #include "image_map_nearest_solid_rotate_capi.h" */
-/* #include "image_map_rotate_capi.h" */
-/* #include "image_map_solid_rotate_capi.h" */
-/* #include "image_quality_scale_capi.h" */
-/* #include "line_blend_capi.h" */
-/* #include "proxy_image_capi.h" */
-/* #include "proxy_image_offscreen_capi.h" */
-/* #include "proxy_text_fixed_capi.h" */
-/* #include "proxy_text_random_capi.h" */
-/* #include "rect_blend_capi.h" */
-/* #include "rect_blend_few_capi.h" */
-/* #include "rect_blend_pow2_capi.h" */
-/* #include "rect_blend_pow2_few_capi.h" */
-/* #include "rect_solid_capi.h" */
-/* #include "rect_solid_few_capi.h" */
-/* #include "text_basic_capi.h" */
-/* #include "text_change_capi.h" */
-/* #include "text_styles_capi.h" */
-/* #include "text_styles_different_strings_capi.h" */
-/* #include "textblock_auto_align_capi.h" */
-/* #include "textblock_basic_capi.h" */
-/* #include "textblock_intl_capi.h" */
-/* #include "textblock_text_append_capi.h" */
-/* #include "widgets_file_icons_2_capi.h" */
-/* #include "widgets_file_icons_2_grouped_capi.h" */
-/* #include "widgets_file_icons_2_same_capi.h" */
-/* #include "widgets_file_icons_2_same_grouped_capi.h" */
-/* #include "widgets_file_icons_3_capi.h" */
-/* #include "widgets_file_icons_4_capi.h" */
-/* #include "widgets_file_icons_capi.h" */
-/* #include "widgets_list_1_capi.h" */
-/* #include "widgets_list_1_grouped_capi.h" */
-/* #include "widgets_list_2_capi.h" */
-/* #include "widgets_list_2_grouped_capi.h" */
-/* #include "widgets_list_3_capi.h" */
-/* #include "widgets_list_3_grouped_capi.h" */
-/* #include "widgets_list_4_capi.h" */
-/* #include "widgets_list_4_grouped_capi.h" */
+#include "image_blend_many_smooth_same_scaled_capi.h"
+#include "image_blend_nearest_same_scaled_capi.h"
+#include "image_blend_nearest_scaled_capi.h"
+#include "image_blend_nearest_solid_same_scaled_capi.h"
+#include "image_blend_nearest_solid_scaled_capi.h"
+#include "image_blend_occlude1_capi.h"
+#include "image_blend_occlude1_few_capi.h"
+#include "image_blend_occlude1_many_capi.h"
+#include "image_blend_occlude1_very_many_capi.h"
+#include "image_blend_occlude2_capi.h"
+#include "image_blend_occlude2_few_capi.h"
+#include "image_blend_occlude2_many_capi.h"
+#include "image_blend_occlude2_very_many_capi.h"
+#include "image_blend_occlude3_capi.h"
+#include "image_blend_occlude3_few_capi.h"
+#include "image_blend_occlude3_many_capi.h"
+#include "image_blend_occlude3_very_many_capi.h"
+#include "image_blend_smooth_same_scaled_capi.h"
+#include "image_blend_smooth_scaled_capi.h"
+#include "image_blend_smooth_solid_same_scaled_capi.h"
+#include "image_blend_smooth_solid_scaled_capi.h"
+#include "image_blend_solid_border_capi.h"
+#include "image_blend_solid_fade_pow2_unscaled_capi.h"
+#include "image_blend_solid_fade_unscaled_capi.h"
+#include "image_blend_solid_middle_border_capi.h"
+#include "image_blend_solid_middle_unscaled_capi.h"
+#include "image_blend_solid_unscaled_capi.h"
+#include "image_blend_unscaled_capi.h"
+#include "image_crossfade_capi.h"
+#include "image_data_argb_alpha_capi.h"
+#include "image_data_argb_capi.h"
+#include "image_data_ycbcr601pl_capi.h"
+#include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h"
+#include "image_data_ycbcr601pl_map_solid_rotate_capi.h"
+#include "image_data_ycbcr601pl_wide_stride_capi.h"
+#include "image_map_3d_1_capi.h"
+#include "image_map_3d_2_capi.h"
+#include "image_map_3d_3_capi.h"
+#include "image_map_3d_4_capi.h"
+#include "image_map_3d_5_capi.h"
+#include "image_map_3d_6_capi.h"
+#include "image_map_3d_flow_capi.h"
+#include "image_map_color_alpha_nearest_rotate_capi.h"
+#include "image_map_color_alpha_nearest_solid_rotate_capi.h"
+#include "image_map_color_alpha_rotate_capi.h"
+#include "image_map_color_alpha_solid_rotate_capi.h"
+#include "image_map_color_nearest_rotate_capi.h"
+#include "image_map_color_nearest_solid_rotate_capi.h"
+#include "image_map_color_rotate_capi.h"
+#include "image_map_color_solid_rotate_capi.h"
+#include "image_map_nearest_rotate_capi.h"
+#include "image_map_nearest_solid_rotate_capi.h"
+#include "image_map_rotate_capi.h"
+#include "image_map_solid_rotate_capi.h"
+#include "image_quality_scale_capi.h"
+#include "line_blend_capi.h"
+#include "proxy_image_capi.h"
+#include "proxy_image_offscreen_capi.h"
+#include "proxy_text_fixed_capi.h"
+#include "proxy_text_random_capi.h"
+#include "rect_blend_capi.h"
+#include "rect_blend_few_capi.h"
+#include "rect_blend_pow2_capi.h"
+#include "rect_blend_pow2_few_capi.h"
+#include "rect_solid_capi.h"
+#include "rect_solid_few_capi.h"
+#include "text_basic_capi.h"
+#include "text_change_capi.h"
+#include "text_styles_capi.h"
+#include "text_styles_different_strings_capi.h"
+#include "textblock_auto_align_capi.h"
+#include "textblock_basic_capi.h"
+#include "textblock_intl_capi.h"
+#include "textblock_text_append_capi.h"
+#include "widgets_file_icons_2_capi.h"
+#include "widgets_file_icons_2_grouped_capi.h"
+#include "widgets_file_icons_2_same_capi.h"
+#include "widgets_file_icons_2_same_grouped_capi.h"
+#include "widgets_file_icons_3_capi.h"
+#include "widgets_file_icons_4_capi.h"
+#include "widgets_file_icons_capi.h"
+#include "widgets_list_1_capi.h"
+#include "widgets_list_1_grouped_capi.h"
+#include "widgets_list_2_capi.h"
+#include "widgets_list_2_grouped_capi.h"
+#include "widgets_list_3_capi.h"
+#include "widgets_list_3_grouped_capi.h"
+#include "widgets_list_4_capi.h"
+#include "widgets_list_4_grouped_capi.h"
 
 #ifdef __cplusplus
 }
diff --git a/src/bin/cxx/text_styles.cc b/src/bin/cxx/text_styles.cc
index 6299954..446ec22 100644
--- a/src/bin/cxx/text_styles.cc
+++ b/src/bin/cxx/text_styles.cc
@@ -73,7 +73,8 @@ static void _loop(double t, int f)
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/textblock_auto_align.cc b/src/bin/cxx/textblock_auto_align.cc
index bf23787..8e822e5 100644
--- a/src/bin/cxx/textblock_auto_align.cc
+++ b/src/bin/cxx/textblock_auto_align.cc
@@ -19,7 +19,7 @@
 static int done = 0;
 
 /* private data */
-static evas::textblock text;
+//static evas::textblock text; // XXX not allowed to
 
 /* setup */
 static void _setup(void)
@@ -86,8 +86,8 @@ static void _loop(double t, int f)
          evas_obj_position_set(x, y),
          evas_obj_size_set(w, h));
 
-   FPS_STD(NAME);
 #endif /// XXX   
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/textblock_basic.cc b/src/bin/cxx/textblock_basic.cc
index 54ce27f..9a905ff 100644
--- a/src/bin/cxx/textblock_basic.cc
+++ b/src/bin/cxx/textblock_basic.cc
@@ -19,7 +19,7 @@
 static int done = 0;
 
 /* private data */
-static evas::text text;
+// static evas::text text; // XXX not allowed to
 
 /* setup */
 static void _setup(void)
@@ -148,9 +148,8 @@ static void _loop(double t, int f)
    eo_do(o_text,
          evas_obj_position_set(x, y),
          evas_obj_size_set(w, 5000));
-
-   FPS_STD(NAME);
-#endif   
+#endif
+      FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/textblock_intl.cc b/src/bin/cxx/textblock_intl.cc
index 0ebd9c9..ded74f7 100644
--- a/src/bin/cxx/textblock_intl.cc
+++ b/src/bin/cxx/textblock_intl.cc
@@ -19,7 +19,7 @@
 static int done = 0;
 
 /* private data */
-evas::text text;
+//evas::text text; // XXX not allowed to
 
 /* setup */
 static void _setup(void)
@@ -119,8 +119,8 @@ static void _loop(double t, int f)
          evas_obj_position_set(x, y),
          evas_obj_size_set(w, h));
 
+#endif // XXX
    FPS_STD(NAME);
-#endif // XXX   
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/textblock_text_append.cc b/src/bin/cxx/textblock_text_append.cc
index 67a7c31..44be4e9 100644
--- a/src/bin/cxx/textblock_text_append.cc
+++ b/src/bin/cxx/textblock_text_append.cc
@@ -19,7 +19,7 @@
 static int done = 0;
 
 /* private data */
-static evas::text text;
+// static evas::text text; // XXX not allowed to
 
 /* setup */
 static void _setup(void)
@@ -135,8 +135,8 @@ static void _loop(double t, int f)
    else
      evas_textblock_cursor_paragraph_next(cur);
 
+#endif // XXX
    FPS_STD(NAME);
-#endif // XXX   
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index 6f0f9d8..5fe4559 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -101,7 +101,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 53d9294..45e8d4f 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -98,7 +98,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index aa63752..04ac413 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -108,7 +108,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc
index 2b58c91..d180ee4 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -84,7 +84,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif    
+#endif
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
index 0ab25b6..c0c72f8 100644
--- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
@@ -92,8 +92,9 @@ static void _loop(double t, int f)
              y += ICON_SIZE + 16;
           }
      }
+#endif
    FPS_STD(NAME);
-#endif    
+      FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc
index 8235c39..3a5524c 100644
--- a/src/bin/cxx/widgets_file_icons_3.cc
+++ b/src/bin/cxx/widgets_file_icons_3.cc
@@ -98,7 +98,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 
diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc
index 342cc6b..4ba708b 100644
--- a/src/bin/cxx/widgets_file_icons_4.cc
+++ b/src/bin/cxx/widgets_file_icons_4.cc
@@ -98,7 +98,8 @@ static void _loop(double t, int f)
           }
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc
index e4dc19f..4884b8f 100644
--- a/src/bin/cxx/widgets_list_1.cc
+++ b/src/bin/cxx/widgets_list_1.cc
@@ -111,7 +111,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc
index 924ca4f..91ef32d 100644
--- a/src/bin/cxx/widgets_list_1_grouped.cc
+++ b/src/bin/cxx/widgets_list_1_grouped.cc
@@ -118,7 +118,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index c5c7b9c..40f3be8 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -111,7 +111,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc
index 6521ce5..4705668 100644
--- a/src/bin/cxx/widgets_list_2_grouped.cc
+++ b/src/bin/cxx/widgets_list_2_grouped.cc
@@ -119,7 +119,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc
index fbf2170..660d9f4 100644
--- a/src/bin/cxx/widgets_list_3.cc
+++ b/src/bin/cxx/widgets_list_3.cc
@@ -140,7 +140,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc
index 77fb475..874f530 100644
--- a/src/bin/cxx/widgets_list_3_grouped.cc
+++ b/src/bin/cxx/widgets_list_3_grouped.cc
@@ -159,7 +159,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif // XXX   
+#endif // XXX
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc
index f9291ca..72fdc9c 100644
--- a/src/bin/cxx/widgets_list_4.cc
+++ b/src/bin/cxx/widgets_list_4.cc
@@ -142,7 +142,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 
diff --git a/src/bin/cxx/widgets_list_4_grouped.cc b/src/bin/cxx/widgets_list_4_grouped.cc
index 84b32f3..3f1ae15 100644
--- a/src/bin/cxx/widgets_list_4_grouped.cc
+++ b/src/bin/cxx/widgets_list_4_grouped.cc
@@ -153,7 +153,8 @@ static void _loop(double t, int f)
         y += ICON_SIZE;
      }
    FPS_STD(NAME);
-#endif   
+#endif
+   FPS_STD(NAME);
 }
 
 static void _key(char *key)