brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conformance: Clean up

Browse Source 
Remove the last inconsistent bits.
This commit is contained in:
Emmanuele Bassi 2012-02-27 13:08:31 +00:00
parent 60e2f8ed5b
commit 4e6ff76a77
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/conform/Makefile.am
View File

@ -57,13 +57,13 @@ units_sources += \
actor-offscreen-redirect.c \ actor-offscreen-redirect.c \
actor-paint-opacity.c \ actor-paint-opacity.c \
actor-pick.c \ actor-pick.c \
actor-shader-effect.c \
actor-size.c \ actor-size.c \
binding-pool.c \ binding-pool.c \
cairo-texture.c \ cairo-texture.c \
group.c \ group.c \
path.c \ path.c \
rectangle.c \ rectangle.c \
shader-effect.c \
texture-fbo.c \ texture-fbo.c \
texture.c \ texture.c \
text-cache.c \ text-cache.c \

8
tests/conform/actor-layout.c
View File

@ -204,8 +204,8 @@ test_state_run (TestState *state)
} }
void void
basic_layout (TestConformSimpleFixture *fixture, actor_basic_layout (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *stage = clutter_stage_new (); ClutterActor *stage = clutter_stage_new ();
ClutterActor *vase; ClutterActor *vase;
@ -248,8 +248,8 @@ basic_layout (TestConformSimpleFixture *fixture,
} }
void void
margin_layout (TestConformSimpleFixture *fixture, actor_margin_layout (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *stage = clutter_stage_new (); ClutterActor *stage = clutter_stage_new ();
ClutterActor *vase; ClutterActor *vase;

4
tests/conform/actor-offscreen-redirect.c
View File

@ -294,8 +294,8 @@ timeout_cb (gpointer user_data)
} }
void void
test_offscreen_redirect (TestConformSimpleFixture *fixture, actor_offscreen_redirect (TestConformSimpleFixture *fixture,
gconstpointer test_data) gconstpointer test_data)
{ {
if (cogl_features_available (COGL_FEATURE_OFFSCREEN)) if (cogl_features_available (COGL_FEATURE_OFFSCREEN))
{ {

2
tests/conform/actor-pick.c
View File

@ -240,7 +240,7 @@ on_timeout (gpointer data)
} }
void void
actor_picking (void) actor_pick (void)
{ {
int y, x; int y, x;
State state; State state;

4
tests/conform/shader-effect.c → tests/conform/actor-shader-effect.c
View File

@ -233,8 +233,8 @@ paint_cb (ClutterActor *stage)
} }
void void
test_shader_effect (TestConformSimpleFixture *fixture, actor_shader_effect (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *stage; ClutterActor *stage;
ClutterActor *rect; ClutterActor *rect;

2
tests/conform/path.c
View File

@ -680,7 +680,7 @@ compare_nodes (CallbackData *data)
} }
void void
test_path (TestConformSimpleFixture *fixture, path_base (TestConformSimpleFixture *fixture,
gconstpointer _data) gconstpointer _data)
{ {
CallbackData data; CallbackData data;

12
tests/conform/test-conform-main.c
View File

@ -139,13 +139,13 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/actor", actor_container_signals); TEST_CONFORM_SIMPLE ("/actor", actor_container_signals);
TEST_CONFORM_SIMPLE ("/actor", actor_destruction); TEST_CONFORM_SIMPLE ("/actor", actor_destruction);
TEST_CONFORM_SIMPLE ("/actor", actor_anchors); TEST_CONFORM_SIMPLE ("/actor", actor_anchors);
TEST_CONFORM_SIMPLE ("/actor", actor_picking); TEST_CONFORM_SIMPLE ("/actor", actor_pick);
TEST_CONFORM_SIMPLE ("/actor", actor_fixed_size); TEST_CONFORM_SIMPLE ("/actor", actor_fixed_size);
TEST_CONFORM_SIMPLE ("/actor", actor_preferred_size); TEST_CONFORM_SIMPLE ("/actor", actor_preferred_size);
TEST_CONFORM_SIMPLE ("/actor", basic_layout); TEST_CONFORM_SIMPLE ("/actor", actor_basic_layout);
TEST_CONFORM_SIMPLE ("/actor", margin_layout); TEST_CONFORM_SIMPLE ("/actor", actor_margin_layout);
TEST_CONFORM_SIMPLE ("/actor", test_offscreen_redirect); TEST_CONFORM_SIMPLE ("/actor", actor_offscreen_redirect);
TEST_CONFORM_SIMPLE ("/actor", test_shader_effect); TEST_CONFORM_SIMPLE ("/actor", actor_shader_effect);
TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_children); TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_children);
TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_remove); TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_remove);
@ -187,7 +187,7 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/texture", texture_fbo); TEST_CONFORM_SIMPLE ("/texture", texture_fbo);
TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo); TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo);
TEST_CONFORM_SIMPLE ("/path", test_path); TEST_CONFORM_SIMPLE ("/path", path_base);
TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool); TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool);