From 46409b4043403c828824ec223134f36c99575bdd Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed, 2 May 2012 12:14:45 +0100
Subject: [PATCH] Move FlowLayout test into examples
There's nothing really test-worthy in the ClutterFlowLayout interactive
test; it can be lifted pretty much as is, and placed into the examples.
---
clutter/clutter-flow-layout.c | 8 ++++++++
examples/Makefile.am | 1 +
.../test-flow-layout.c => examples/flow-layout.c | 10 ++--------
tests/interactive/Makefile.am | 1 -
4 files changed, 11 insertions(+), 9 deletions(-)
rename tests/interactive/test-flow-layout.c => examples/flow-layout.c (95%)
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 38f0fe669..94df4db1f 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -56,6 +56,14 @@
* <graphic fileref="flow-layout.png" format="PNG"/>
* </figure>
*
+ * <informalexample>
+ * <programlisting>
+ * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/flow-layout.c">
+ * <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+ * </xi:include>
+ * </programlisting>
+ * </informalexample>
+ *
* #ClutterFlowLayout is available since Clutter 1.2
*/
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3f46d21bd..c85c3d53e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,6 +7,7 @@ all_examples = \
constraints \
drag-action \
drop-action \
+ flow-layout \
threads
if PIXBUF_TESTS
diff --git a/tests/interactive/test-flow-layout.c b/examples/flow-layout.c
similarity index 95%
rename from tests/interactive/test-flow-layout.c
rename to examples/flow-layout.c
index 271c86184..4f92e85dc 100644
--- a/tests/interactive/test-flow-layout.c
+++ b/examples/flow-layout.c
@@ -67,8 +67,8 @@ static GOptionEntry entries[] = {
{ NULL }
};
-G_MODULE_EXPORT int
-test_flow_layout_main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
ClutterActor *stage, *box;
ClutterLayoutManager *layout;
@@ -152,9 +152,3 @@ test_flow_layout_main (int argc, char *argv[])
return EXIT_SUCCESS;
}
-
-G_MODULE_EXPORT const char *
-test_flow_layout_describe (void)
-{
- return "FlowLayout layout manager example";
-}
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 3669c3641..ba56ec29d 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -38,7 +38,6 @@ UNIT_TESTS = \
test-cairo-clock.c \
test-cairo-flowers.c \
test-cogl-vertex-buffer.c \
- test-flow-layout.c \
test-box-layout.c \
test-stage-sizing.c \
test-scrolling.c \