From 5ad1ec7cca49dfadb330c96f72d64b78d1f7e803 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 8 May 2012 10:51:14 +0100 Subject: [PATCH] Put bind-constraint back into the interactive tests The bind-constraint.c example still uses clutter_actor_animate(), and it'd require some serious reworking to move it to ClutterPropertyTransition or to implicit animations. --- examples/Makefile.am | 1 - tests/interactive/Makefile.am | 3 ++- .../interactive/test-bind-constraint.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) rename examples/bind-constraint.c => tests/interactive/test-bind-constraint.c (97%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 8505847..dc2d358 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent all_examples = \ basic-actor \ - bind-constraint \ canvas \ constraints \ drag-action \ diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 426d2ea..c2be9f4 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -49,7 +49,8 @@ UNIT_TESTS = \ test-devices.c \ test-content.c \ test-keyframe-transition.c \ - test-scroll-actor.c + test-scroll-actor.c \ + test-bind-constraint.c if X11_TESTS UNIT_TESTS += test-pixmap.c diff --git a/examples/bind-constraint.c b/tests/interactive/test-bind-constraint.c similarity index 97% rename from examples/bind-constraint.c rename to tests/interactive/test-bind-constraint.c index 4278e18..6cceeba 100644 --- a/examples/bind-constraint.c +++ b/tests/interactive/test-bind-constraint.c @@ -154,8 +154,14 @@ on_button_release (ClutterActor *actor, return TRUE; } -int -main (int argc, char *argv[]) +G_MODULE_EXPORT const char * +test_bind_constraint_describe (void) +{ + return "Demonstrate the usage of ClutterBindConstraint"; +} + +G_MODULE_EXPORT int +test_bind_constraint_main (int argc, char *argv[]) { ClutterActor *stage, *rect; ClutterConstraint *constraint; -- 2.7.4