summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <quaker66@gmail.com>2014-02-17 11:49:39 +0000
committerDaniel Kolesa <quaker66@gmail.com>2014-02-17 11:49:39 +0000
commit27e488dc042b1eada5accdd3236c0f6146d70c22 (patch)
tree05fc6ad5463cc2eb539145820fa5062c46338df3
parent5fd6c5ddd96be69f5c74e1c2bba57ad3ff4672e7 (diff)
attempt to reduce memory footprint by moving object storage into inner scopes (thus making it test-specific GC memory rather than global memory allocated on initialization)
-rw-r--r--tests/image_blend_many_smooth_same_scaled.lua6
-rw-r--r--tests/image_blend_occlude.lua8
-rw-r--r--tests/image_blend_scaled.lua6
-rw-r--r--tests/image_blend_unscaled.lua6
-rw-r--r--tests/image_crossfade.lua2
-rw-r--r--tests/image_data_argb.lua5
-rw-r--r--tests/image_data_ycbcr601pl.lua3
-rw-r--r--tests/image_data_ycbcr601pl_map_solid_rotate.lua4
-rw-r--r--tests/image_data_ycbcr601pl_wide_stride.lua3
-rw-r--r--tests/image_map_3d_1.lua6
-rw-r--r--tests/image_map_3d_2.lua2
-rw-r--r--tests/image_map_3d_flow.lua6
-rw-r--r--tests/image_map_rotate.lua9
-rw-r--r--tests/image_quality_scale.lua2
-rw-r--r--tests/line_blend.lua6
-rw-r--r--tests/poly_blend.lua6
-rw-r--r--tests/proxy_image.lua6
-rw-r--r--tests/proxy_text_fixed.lua6
-rw-r--r--tests/proxy_text_random.lua6
-rw-r--r--tests/rect.lua6
-rw-r--r--tests/text.lua6
-rw-r--r--tests/text_change.lua6
-rw-r--r--tests/textblock_auto_align.lua4
-rw-r--r--tests/textblock_basic.lua4
-rw-r--r--tests/textblock_intl.lua4
-rw-r--r--tests/textblock_text_append.lua4
-rw-r--r--tests/widgets_file_icons.lua10
-rw-r--r--tests/widgets_list.lua10
28 files changed, 74 insertions, 78 deletions
diff --git a/tests/image_blend_many_smooth_same_scaled.lua b/tests/image_blend_many_smooth_same_scaled.lua
index b3d094b..7b2ba07 100644
--- a/tests/image_blend_many_smooth_same_scaled.lua
+++ b/tests/image_blend_many_smooth_same_scaled.lua
@@ -6,11 +6,11 @@ local levas = util.get_lib("evas")
6local sin, cos = math.sin, math.cos 6local sin, cos = math.sin, math.cos
7 7
8return function(ui, variant) 8return function(ui, variant)
9 local itern = 8192
10 local slow = 5.0
11 local o_images = {}
12 return "blend.png", "Image Blend Many Smooth Down Scaled", 10.000, 9 return "blend.png", "Image Blend Many Smooth Down Scaled", 10.000,
13 function() 10 function()
11 local itern = 8192
12 local slow = 5.0
13 local o_images = {}
14 local win_w, win_h = ui.win_w, ui.win_h 14 local win_w, win_h = ui.win_w, ui.win_h
15 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 15 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
16 ui.func_set(util.del_objs(o_images), function(t, f) 16 ui.func_set(util.del_objs(o_images), function(t, f)
diff --git a/tests/image_blend_occlude.lua b/tests/image_blend_occlude.lua
index 08a212b..7c12293 100644
--- a/tests/image_blend_occlude.lua
+++ b/tests/image_blend_occlude.lua
@@ -57,11 +57,11 @@ local weights = {
57} 57}
58 58
59return function(ui, variant) 59return function(ui, variant)
60 local itern = getitern(variant)
61 local slow = 5.0
62 local o_images = {}
63 local cond = getcond(variant)
64 return "blend.png", variants[variant], weights[variant], function() 60 return "blend.png", variants[variant], weights[variant], function()
61 local o_images = {}
62 local itern = getitern(variant)
63 local slow = 5.0
64 local cond = getcond(variant)
65 local win_w, win_h = ui.win_w, ui.win_h 65 local win_w, win_h = ui.win_w, ui.win_h
66 ui.func_set(util.del_objs(o_images), function(t, f) 66 ui.func_set(util.del_objs(o_images), function(t, f)
67 for i = 1, itern do 67 for i = 1, itern do
diff --git a/tests/image_blend_scaled.lua b/tests/image_blend_scaled.lua
index 9aac561..a86b74c 100644
--- a/tests/image_blend_scaled.lua
+++ b/tests/image_blend_scaled.lua
@@ -44,10 +44,10 @@ local weights = {
44} 44}
45 45
46return function(ui, variant) 46return function(ui, variant)
47 local itern = 128
48 local slow = 5.0
49 local o_images = {}
50 return "blend.png", variants[variant], weights[variant], function() 47 return "blend.png", variants[variant], weights[variant], function()
48 local o_images = {}
49 local itern = 128
50 local slow = 5.0
51 local win_w, win_h = ui.win_w, ui.win_h 51 local win_w, win_h = ui.win_w, ui.win_h
52 local get_wh = (variant > 4 and variant <= 8) 52 local get_wh = (variant > 4 and variant <= 8)
53 and function(w0, h0, i, f) 53 and function(w0, h0, i, f)
diff --git a/tests/image_blend_unscaled.lua b/tests/image_blend_unscaled.lua
index 989547c..1cec9e9 100644
--- a/tests/image_blend_unscaled.lua
+++ b/tests/image_blend_unscaled.lua
@@ -29,10 +29,10 @@ local weights = {
29} 29}
30 30
31return function(ui, variant) 31return function(ui, variant)
32 local itern = 128
33 local slow = 5.0
34 local o_images = {}
35 return "blend.png", variants[variant], weights[variant], function() 32 return "blend.png", variants[variant], weights[variant], function()
33 local o_images = {}
34 local itern = 128
35 local slow = 5.0
36 local win_w, win_h = ui.win_w, ui.win_h 36 local win_w, win_h = ui.win_w, ui.win_h
37 ui.func_set(util.del_objs(o_images), function(t, f) 37 ui.func_set(util.del_objs(o_images), function(t, f)
38 local w, h = 120, 160 38 local w, h = 120, 160
diff --git a/tests/image_crossfade.lua b/tests/image_crossfade.lua
index 724ff38..6122f2e 100644
--- a/tests/image_crossfade.lua
+++ b/tests/image_crossfade.lua
@@ -5,8 +5,8 @@ local levas = util.get_lib("evas")
5local band, bor, lsh, rsh = bit.band, bit.bor, bit.lshift, bit.rshift 5local band, bor, lsh, rsh = bit.band, bit.bor, bit.lshift, bit.rshift
6 6
7return function(ui) 7return function(ui)
8 local images = {}
9 return "blend.png", "Image Crossfade", 24.3482, function() 8 return "blend.png", "Image Crossfade", 24.3482, function()
9 local images = {}
10 local win_w, win_h = ui.win_w, ui.win_h 10 local win_w, win_h = ui.win_w, ui.win_h
11 ui.func_set(util.del_objs(images), function(t, f) 11 ui.func_set(util.del_objs(images), function(t, f)
12 local a = band(f, 0x1F) 12 local a = band(f, 0x1F)
diff --git a/tests/image_data_argb.lua b/tests/image_data_argb.lua
index b6f2a3b..f6afe92 100644
--- a/tests/image_data_argb.lua
+++ b/tests/image_data_argb.lua
@@ -1,5 +1,6 @@
1local ffi = require("ffi") 1local ffi = require("ffi")
2local ffi_cast = ffi.cast 2local ffi_cast = ffi.cast
3local ffi_new = ffi.new
3local util = require("util") 4local util = require("util")
4local levas = util.get_lib("evas") 5local levas = util.get_lib("evas")
5 6
@@ -28,9 +29,9 @@ local pixelfuncs = {
28} 29}
29 30
30return function(ui, variant) 31return function(ui, variant)
31 local image
32 local pixelfunc = pixelfuncs[variant]
33 return "data.png", names[variant], weights[variant], function() 32 return "data.png", names[variant], weights[variant], function()
33 local image
34 local pixelfunc = pixelfuncs[variant]
34 local win_w, win_h = ui.win_w, ui.win_h 35 local win_w, win_h = ui.win_w, ui.win_h
35 ui.func_set(function() 36 ui.func_set(function()
36 levas.evas_object_del(image) 37 levas.evas_object_del(image)
diff --git a/tests/image_data_ycbcr601pl.lua b/tests/image_data_ycbcr601pl.lua
index 5724858..b832b24 100644
--- a/tests/image_data_ycbcr601pl.lua
+++ b/tests/image_data_ycbcr601pl.lua
@@ -6,9 +6,8 @@ local levas = util.get_lib("evas")
6ffi.cdef [[ size_t fread (void *ptr, size_t size, size_t n, void *stream); ]] 6ffi.cdef [[ size_t fread (void *ptr, size_t size, size_t n, void *stream); ]]
7 7
8return function(ui) 8return function(ui)
9 local image
10 local yp, up, vp
11 return "data.png", "Image Data YCbCr 601 Pointer List", 14.7573, function() 9 return "data.png", "Image Data YCbCr 601 Pointer List", 14.7573, function()
10 local image, yp, up, vp
12 local win_w, win_h = ui.win_w, ui.win_h 11 local win_w, win_h = ui.win_w, ui.win_h
13 ui.func_set(function() levas.evas_object_del(image) end, function(t, f) 12 ui.func_set(function() levas.evas_object_del(image) end, function(t, f)
14 local w = 640 13 local w = 640
diff --git a/tests/image_data_ycbcr601pl_map_solid_rotate.lua b/tests/image_data_ycbcr601pl_map_solid_rotate.lua
index f9f523a..60f8b58 100644
--- a/tests/image_data_ycbcr601pl_map_solid_rotate.lua
+++ b/tests/image_data_ycbcr601pl_map_solid_rotate.lua
@@ -11,11 +11,9 @@ local names = {
11} 11}
12 12
13return function(ui, variant) 13return function(ui, variant)
14 local image
15 local yp, up, vp
16 return "data.png", names[variant], 5.0000, function() 14 return "data.png", names[variant], 5.0000, function()
15 local image, yp, up, vp, m
17 local win_w, win_h = ui.win_w, ui.win_h 16 local win_w, win_h = ui.win_w, ui.win_h
18 local m
19 ui.func_set(function() levas.evas_object_del(image) end, function(t, f) 17 ui.func_set(function() levas.evas_object_del(image) end, function(t, f)
20 if not m then m = levas.evas_map_new(4) end 18 if not m then m = levas.evas_map_new(4) end
21 levas.evas_map_smooth_set(m, (variant == 2) and 0 or 1) 19 levas.evas_map_smooth_set(m, (variant == 2) and 0 or 1)
diff --git a/tests/image_data_ycbcr601pl_wide_stride.lua b/tests/image_data_ycbcr601pl_wide_stride.lua
index 9119e43..5efe4c8 100644
--- a/tests/image_data_ycbcr601pl_wide_stride.lua
+++ b/tests/image_data_ycbcr601pl_wide_stride.lua
@@ -9,10 +9,9 @@ ffi.cdef [[ size_t fread (void *ptr, size_t size, size_t n, void *stream); ]]
9local band, bnot = bit.band, bit.bnot 9local band, bnot = bit.band, bit.bnot
10 10
11return function(ui) 11return function(ui)
12 local image
13 local yp, up, vp
14 return "data.png", "Image Data YCbCr 601 Pointer List Wide Stride", 12 return "data.png", "Image Data YCbCr 601 Pointer List Wide Stride",
15 36.5261, function() 13 36.5261, function()
14 local image, yp, up, vp
16 local win_w, win_h = ui.win_w, ui.win_h 15 local win_w, win_h = ui.win_w, ui.win_h
17 ui.func_set(function() levas.evas_object_del(image) end, function(t, f) 16 ui.func_set(function() levas.evas_object_del(image) end, function(t, f)
18 local w = 640 17 local w = 640
diff --git a/tests/image_map_3d_1.lua b/tests/image_map_3d_1.lua
index 49a75cd..d003ad4 100644
--- a/tests/image_map_3d_1.lua
+++ b/tests/image_map_3d_1.lua
@@ -133,10 +133,10 @@ local weights = {
133} 133}
134 134
135return function(ui, variant) 135return function(ui, variant)
136 local cubes = {}
137 local sm = smooth[variant]
138 local nocw = (variant >= 3)
139 return "3d.png", variants[variant], weights[variant], function() 136 return "3d.png", variants[variant], weights[variant], function()
137 local cubes = {}
138 local sm = smooth[variant]
139 local nocw = (variant >= 3)
140 win_w, win_h = ui.win_w, ui.win_h 140 win_w, win_h = ui.win_w, ui.win_h
141 local m 141 local m
142 ui.func_set(function() 142 ui.func_set(function()
diff --git a/tests/image_map_3d_2.lua b/tests/image_map_3d_2.lua
index b222506..80aea26 100644
--- a/tests/image_map_3d_2.lua
+++ b/tests/image_map_3d_2.lua
@@ -127,8 +127,8 @@ local weights = {
127} 127}
128 128
129return function(ui, variant) 129return function(ui, variant)
130 local cube
131 return "3d.png", variants[variant], weights[variant], function() 130 return "3d.png", variants[variant], weights[variant], function()
131 local cube
132 win_w, win_h = ui.win_w, ui.win_h 132 win_w, win_h = ui.win_w, ui.win_h
133 local m 133 local m
134 ui.func_set( function() 134 ui.func_set( function()
diff --git a/tests/image_map_3d_flow.lua b/tests/image_map_3d_flow.lua
index dfcbd7d..80bb720 100644
--- a/tests/image_map_3d_flow.lua
+++ b/tests/image_map_3d_flow.lua
@@ -3,10 +3,10 @@ local util = require("util")
3local levas = util.get_lib("evas") 3local levas = util.get_lib("evas")
4 4
5return function(ui, variant) 5return function(ui, variant)
6 local itern = 48
7 local o_images, o_reflec = {}, {}
8 return "3d.png", "Image Map 3D Flow", 29.0141, function() 6 return "3d.png", "Image Map 3D Flow", 29.0141, function()
9 local win_w, win_h = ui.win_w, ui.win_h 7 local o_images, o_reflec = {}, {}
8 local itern = 48
9 local win_w, win_h = ui.win_w, ui.win_h
10 local m 10 local m
11 ui.func_set(util.del_objs(o_images, o_reflec), function(t, f) 11 ui.func_set(util.del_objs(o_images, o_reflec), function(t, f)
12 if not m then m = levas.evas_map_new(4) end 12 if not m then m = levas.evas_map_new(4) end
diff --git a/tests/image_map_rotate.lua b/tests/image_map_rotate.lua
index 17b3237..2ba771f 100644
--- a/tests/image_map_rotate.lua
+++ b/tests/image_map_rotate.lua
@@ -44,13 +44,12 @@ local weights = {
44} 44}
45 45
46return function(ui, variant) 46return function(ui, variant)
47 local itern = 64
48 local slow = 5.0
49 local o_images = {}
50 return "map.png", variants[variant], weights[variant], function() 47 return "map.png", variants[variant], weights[variant], function()
48 local o_images = {}
49 local itern = 64
50 local slow = 5.0
51 local win_w, win_h = ui.win_w, ui.win_h 51 local win_w, win_h = ui.win_w, ui.win_h
52 local m 52 local m, mapcolorf
53 local mapcolorf
54 if variant >= 9 then 53 if variant >= 9 then
55 mapcolorf = function() 54 mapcolorf = function()
56 levas.evas_map_point_color_set(m, 0, 255, 255, 255, 255) 55 levas.evas_map_point_color_set(m, 0, 255, 255, 255, 255)
diff --git a/tests/image_quality_scale.lua b/tests/image_quality_scale.lua
index 9ca9444..35570bc 100644
--- a/tests/image_quality_scale.lua
+++ b/tests/image_quality_scale.lua
@@ -3,8 +3,8 @@ local util = require("util")
3local levas = util.get_lib("evas") 3local levas = util.get_lib("evas")
4 4
5return function(ui) 5return function(ui)
6 local image
7 return "data.png", "Image Quality Scale", 131.6784, function() 6 return "data.png", "Image Quality Scale", 131.6784, function()
7 local image
8 local win_w, win_h = ui.win_w, ui.win_h 8 local win_w, win_h = ui.win_w, ui.win_h
9 ui.func_set(function() 9 ui.func_set(function()
10 levas.evas_object_del(image) 10 levas.evas_object_del(image)
diff --git a/tests/line_blend.lua b/tests/line_blend.lua
index 21d39e9..63662bd 100644
--- a/tests/line_blend.lua
+++ b/tests/line_blend.lua
@@ -29,10 +29,10 @@ local rotate_point = function(ox, oy, r, win_w, win_h)
29end 29end
30 30
31return function(ui) 31return function(ui)
32 local itern = 128
33 local slow = 5
34 local o_images = {}
35 return "rect.png", "Line Blend", 1.000, function() 32 return "rect.png", "Line Blend", 1.000, function()
33 local itern = 128
34 local slow = 5
35 local o_images = {}
36 local win_w, win_h = ui.win_w, ui.win_h 36 local win_w, win_h = ui.win_w, ui.win_h
37 local ox1, oy1 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 37 local ox1, oy1 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
38 local ox2, oy2 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 38 local ox2, oy2 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
diff --git a/tests/poly_blend.lua b/tests/poly_blend.lua
index 6d58517..bf41faa 100644
--- a/tests/poly_blend.lua
+++ b/tests/poly_blend.lua
@@ -46,10 +46,10 @@ local poly = function(o, tp, x, y)
46end 46end
47 47
48return function(ui) 48return function(ui)
49 local itern = 128
50 local slow = 5
51 local o_images = {}
52 return "rect.png", "Polygon Blend", 0.5000, function() 49 return "rect.png", "Polygon Blend", 0.5000, function()
50 local itern = 128
51 local slow = 5
52 local o_images = {}
53 local win_w, win_h = ui.win_w, ui.win_h 53 local win_w, win_h = ui.win_w, ui.win_h
54 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 54 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
55 ui.func_set(util.del_objs(o_images), function(t, f) 55 ui.func_set(util.del_objs(o_images), function(t, f)
diff --git a/tests/proxy_image.lua b/tests/proxy_image.lua
index 0d6b6ae..556e941 100644
--- a/tests/proxy_image.lua
+++ b/tests/proxy_image.lua
@@ -5,10 +5,10 @@ local levas = util.get_lib("evas")
5local sin, cos = math.sin, math.cos 5local sin, cos = math.sin, math.cos
6 6
7return function(ui) 7return function(ui)
8 local itern = 128
9 local slow = 5
10 local o_images = {}
11 return "blend.png", "Image Blend Unscaled Proxy", 1.000, function() 8 return "blend.png", "Image Blend Unscaled Proxy", 1.000, function()
9 local itern = 128
10 local slow = 5
11 local o_images = {}
12 local win_w, win_h = ui.win_w, ui.win_h 12 local win_w, win_h = ui.win_w, ui.win_h
13 ui.func_set(util.del_objs(o_images), function(t, f) 13 ui.func_set(util.del_objs(o_images), function(t, f)
14 for i = 1, itern do 14 for i = 1, itern do
diff --git a/tests/proxy_text_fixed.lua b/tests/proxy_text_fixed.lua
index 56af401..742c264 100644
--- a/tests/proxy_text_fixed.lua
+++ b/tests/proxy_text_fixed.lua
@@ -6,10 +6,10 @@ local levas = util.get_lib("evas")
6local sin, cos = math.sin, math.cos 6local sin, cos = math.sin, math.cos
7 7
8return function(ui) 8return function(ui)
9 local itern = 128
10 local slow = 5
11 local o_texts = {}
12 return "text.png", "Proxy Text Fixed", 10.000, function() 9 return "text.png", "Proxy Text Fixed", 10.000, function()
10 local itern = 128
11 local slow = 5
12 local o_texts = {}
13 local win_w, win_h = ui.win_w, ui.win_h 13 local win_w, win_h = ui.win_w, ui.win_h
14 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 14 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
15 ui.func_set(util.del_objs(o_texts), function(t, f) 15 ui.func_set(util.del_objs(o_texts), function(t, f)
diff --git a/tests/proxy_text_random.lua b/tests/proxy_text_random.lua
index 9723d27..83507e4 100644
--- a/tests/proxy_text_random.lua
+++ b/tests/proxy_text_random.lua
@@ -12,10 +12,10 @@ local strs = {
12} 12}
13 13
14return function(ui) 14return function(ui)
15 local itern = 128
16 local slow = 5
17 local o_texts = {}
18 return "text.png", "Proxy Text Random", 5.000, function() 15 return "text.png", "Proxy Text Random", 5.000, function()
16 local itern = 128
17 local slow = 5
18 local o_texts = {}
19 local win_w, win_h = ui.win_w, ui.win_h 19 local win_w, win_h = ui.win_w, ui.win_h
20 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 20 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
21 ui.func_set(util.del_objs(o_texts), function(t, f) 21 ui.func_set(util.del_objs(o_texts), function(t, f)
diff --git a/tests/rect.lua b/tests/rect.lua
index 890bda4..0a4cdd4 100644
--- a/tests/rect.lua
+++ b/tests/rect.lua
@@ -22,10 +22,10 @@ local weights = {
22} 22}
23 23
24return function(ui, variant) 24return function(ui, variant)
25 local itern = (variant > 3) and 3 or 128
26 local slow = 5
27 local o_images = {}
28 return "rect.png", names[variant], weights[variant], function() 25 return "rect.png", names[variant], weights[variant], function()
26 local itern = (variant > 3) and 3 or 128
27 local slow = 5
28 local o_images = {}
29 local win_w, win_h = ui.win_w, ui.win_h 29 local win_w, win_h = ui.win_w, ui.win_h
30 local i1, i2 30 local i1, i2
31 if variant == 4 then 31 if variant == 4 then
diff --git a/tests/text.lua b/tests/text.lua
index 9196f5a..fc84c20 100644
--- a/tests/text.lua
+++ b/tests/text.lua
@@ -22,10 +22,10 @@ local weights = {
22} 22}
23 23
24return function(ui, variant) 24return function(ui, variant)
25 local itern = 128
26 local slow = 5
27 local o_texts = {}
28 return "text.png", variants[variant], weights[variant], function() 25 return "text.png", variants[variant], weights[variant], function()
26 local itern = 128
27 local slow = 5
28 local o_texts = {}
29 local win_w, win_h = ui.win_w, ui.win_h 29 local win_w, win_h = ui.win_w, ui.win_h
30 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 30 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
31 ui.func_set(util.del_objs(o_texts), function(t, f) 31 ui.func_set(util.del_objs(o_texts), function(t, f)
diff --git a/tests/text_change.lua b/tests/text_change.lua
index d86894b..2b20611 100644
--- a/tests/text_change.lua
+++ b/tests/text_change.lua
@@ -12,10 +12,10 @@ local strs = {
12local sin, cos = math.sin, math.cos 12local sin, cos = math.sin, math.cos
13 13
14return function(ui) 14return function(ui)
15 local itern = 128
16 local slow = 5
17 local o_texts = {}
18 return "text.png", "Text Change", 18.6459, function() 15 return "text.png", "Text Change", 18.6459, function()
16 local itern = 128
17 local slow = 5
18 local o_texts = {}
19 local win_w, win_h = ui.win_w, ui.win_h 19 local win_w, win_h = ui.win_w, ui.win_h
20 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 20 local w, h = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
21 ui.func_set(util.del_objs(o_texts), function(t, f) 21 ui.func_set(util.del_objs(o_texts), function(t, f)
diff --git a/tests/textblock_auto_align.lua b/tests/textblock_auto_align.lua
index 4428190..eebb509 100644
--- a/tests/textblock_auto_align.lua
+++ b/tests/textblock_auto_align.lua
@@ -6,9 +6,9 @@ local levas = util.get_lib("evas")
6local sin, abs = math.sin, math.abs 6local sin, abs = math.sin, math.abs
7 7
8return function(ui, variant) 8return function(ui, variant)
9 local text
10 local slow = 5
11 return "text.png", "Textblock auto align", 11.5449, function() 9 return "text.png", "Textblock auto align", 11.5449, function()
10 local text
11 local slow = 5
12 local win_w, win_h = ui.win_w, ui.win_h 12 local win_w, win_h = ui.win_w, ui.win_h
13 local w0, h0 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 13 local w0, h0 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
14 ui.func_set(function() 14 ui.func_set(function()
diff --git a/tests/textblock_basic.lua b/tests/textblock_basic.lua
index 695001f..14bc23b 100644
--- a/tests/textblock_basic.lua
+++ b/tests/textblock_basic.lua
@@ -5,9 +5,9 @@ local levas = util.get_lib("evas")
5local sin, cos = math.sin, math.cos 5local sin, cos = math.sin, math.cos
6 6
7return function(ui, variant) 7return function(ui, variant)
8 local text
9 local slow = 5
10 return "text.png", "Textblock Basic", 37.4608, function() 8 return "text.png", "Textblock Basic", 37.4608, function()
9 local text
10 local slow = 5
11 local win_w, win_h = ui.win_w, ui.win_h 11 local win_w, win_h = ui.win_w, ui.win_h
12 ui.func_set(function() 12 ui.func_set(function()
13 levas.evas_object_del(text) 13 levas.evas_object_del(text)
diff --git a/tests/textblock_intl.lua b/tests/textblock_intl.lua
index fc74b77..00facf3 100644
--- a/tests/textblock_intl.lua
+++ b/tests/textblock_intl.lua
@@ -6,9 +6,9 @@ local levas = util.get_lib("evas")
6local sin, cos = math.sin, math.cos 6local sin, cos = math.sin, math.cos
7 7
8return function(ui, variant) 8return function(ui, variant)
9 local text
10 local slow = 5
11 return "text.png", "Textblock Intl", 32.4417, function() 9 return "text.png", "Textblock Intl", 32.4417, function()
10 local text
11 local slow = 5
12 local win_w, win_h = ui.win_w, ui.win_h 12 local win_w, win_h = ui.win_w, ui.win_h
13 local w0, h0 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 13 local w0, h0 = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
14 ui.func_set(function() 14 ui.func_set(function()
diff --git a/tests/textblock_text_append.lua b/tests/textblock_text_append.lua
index d181177..da48f18 100644
--- a/tests/textblock_text_append.lua
+++ b/tests/textblock_text_append.lua
@@ -3,9 +3,9 @@ local util = require("util")
3local levas = util.get_lib("evas") 3local levas = util.get_lib("evas")
4 4
5return function(ui, variant) 5return function(ui, variant)
6 local text
7 local slow = 5
8 return "text.png", "Textblock text_append", 5.0000, function() 6 return "text.png", "Textblock text_append", 5.0000, function()
7 local text
8 local slow = 5
9 local win_w, win_h = ui.win_w, ui.win_h 9 local win_w, win_h = ui.win_w, ui.win_h
10 local cur2 10 local cur2
11 ui.func_set(function() 11 ui.func_set(function()
diff --git a/tests/widgets_file_icons.lua b/tests/widgets_file_icons.lua
index e4de9dc..90bc02a 100644
--- a/tests/widgets_file_icons.lua
+++ b/tests/widgets_file_icons.lua
@@ -40,12 +40,12 @@ local weights = {
40} 40}
41 41
42return function(ui, variant) 42return function(ui, variant)
43 local itern = 512
44 local icon_size = (variant == 6) and 16 or ((variant == 7)
45 and 96 or 64)
46 local o_images, o_texts = {}, {}
47 return "widgets.png", variants[variant], weights[variant], function() 43 return "widgets.png", variants[variant], weights[variant], function()
48 local win_w, win_h = ui.win_w, ui.win_h 44 local o_images, o_texts = {}, {}
45 local itern = 512
46 local icon_size = (variant == 6) and 16 or ((variant == 7)
47 and 96 or 64)
48 local win_w, win_h = ui.win_w, ui.win_h
49 local tw, th = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 49 local tw, th = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
50 ui.func_set(util.del_objs(o_images, o_texts), function(t, f) 50 ui.func_set(util.del_objs(o_images, o_texts), function(t, f)
51 local x, y = 0, 0 - f 51 local x, y = 0, 0 - f
diff --git a/tests/widgets_list.lua b/tests/widgets_list.lua
index ebdbd31..1564774 100644
--- a/tests/widgets_list.lua
+++ b/tests/widgets_list.lua
@@ -80,12 +80,12 @@ local weights = {
80} 80}
81 81
82return function(ui, variant) 82return function(ui, variant)
83 local itern = 512
84 local icon_size = iconsizes[variant]
85 local o_images, o_texts = {}, {}
86 local o_icons
87 if variant > 4 then o_icons = {} end
88 return "widgets.png", variants[variant], weights[variant], function() 83 return "widgets.png", variants[variant], weights[variant], function()
84 local itern = 512
85 local icon_size = iconsizes[variant]
86 local o_images, o_texts = {}, {}
87 local o_icons
88 if variant > 4 then o_icons = {} end
89 local win_w, win_h = ui.win_w, ui.win_h 89 local win_w, win_h = ui.win_w, ui.win_h
90 local tw, th = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]") 90 local tw, th = ffi_new("Evas_Coord[1]"), ffi_new("Evas_Coord[1]")
91 ui.func_set(util.del_objs(o_images, o_texts, o_icons), function(t, f) 91 ui.func_set(util.del_objs(o_images, o_texts, o_icons), function(t, f)