2008-11-07 19:32:28 +00:00
|
|
|
UNIT_TESTS = \
|
2011-09-27 16:50:51 +00:00
|
|
|
test-texture-slicing.c \
|
2009-03-11 18:26:30 +00:00
|
|
|
test-texture-async.c \
|
2010-09-02 13:48:30 +00:00
|
|
|
test-texture-material.c \
|
2008-11-07 19:32:28 +00:00
|
|
|
test-events.c \
|
|
|
|
test-scale.c \
|
|
|
|
test-actors.c \
|
2010-12-16 15:30:53 +00:00
|
|
|
test-shader-effects.c \
|
2008-11-07 19:32:28 +00:00
|
|
|
test-script.c \
|
|
|
|
test-grab.c \
|
2010-08-05 14:20:49 +00:00
|
|
|
test-cogl-shader-arbfp.c \
|
2010-08-05 14:18:39 +00:00
|
|
|
test-cogl-shader-glsl.c \
|
2010-02-05 12:32:00 +00:00
|
|
|
test-animator.c \
|
2010-05-11 14:04:34 +00:00
|
|
|
test-state.c \
|
|
|
|
test-state-animator.c \
|
2008-12-19 21:31:18 +00:00
|
|
|
test-fbo.c \
|
2008-11-07 19:32:28 +00:00
|
|
|
test-multistage.c \
|
|
|
|
test-cogl-tex-tile.c \
|
|
|
|
test-cogl-tex-convert.c \
|
|
|
|
test-cogl-tex-foreign.c \
|
|
|
|
test-cogl-offscreen.c \
|
|
|
|
test-cogl-tex-polygon.c \
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
test-cogl-multitexture.c \
|
2008-11-07 19:32:28 +00:00
|
|
|
test-stage-read-pixels.c \
|
|
|
|
test-paint-wrapper.c \
|
|
|
|
test-texture-quality.c \
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
test-layout.c \
|
|
|
|
test-animation.c \
|
2008-12-08 13:57:10 +00:00
|
|
|
test-easing.c \
|
2008-12-11 11:12:48 +00:00
|
|
|
test-binding-pool.c \
|
2009-01-07 00:27:50 +00:00
|
|
|
test-text.c \
|
2009-01-08 18:54:48 +00:00
|
|
|
test-text-field.c \
|
2011-07-26 11:40:52 +00:00
|
|
|
test-cairo-clock.c \
|
2010-10-15 16:35:41 +00:00
|
|
|
test-cairo-flowers.c \
|
2009-09-11 14:34:13 +00:00
|
|
|
test-cogl-vertex-buffer.c \
|
2010-05-12 11:00:33 +00:00
|
|
|
test-stage-sizing.c \
|
2010-06-28 16:18:35 +00:00
|
|
|
test-scrolling.c \
|
2011-03-09 09:06:44 +00:00
|
|
|
test-swipe-action.c \
|
2010-03-18 16:02:31 +00:00
|
|
|
test-cogl-point-sprites.c \
|
2010-10-25 14:47:15 +00:00
|
|
|
test-table-layout.c \
|
2010-11-10 16:37:34 +00:00
|
|
|
test-path-constraint.c \
|
2011-06-17 15:54:31 +00:00
|
|
|
test-state-script.c \
|
2011-12-20 14:47:35 +00:00
|
|
|
test-devices.c \
|
2012-03-08 10:31:21 +00:00
|
|
|
test-content.c \
|
2012-04-12 14:56:53 +00:00
|
|
|
test-keyframe-transition.c \
|
2012-06-04 11:15:43 +00:00
|
|
|
test-bind-constraint.c \
|
2013-04-26 00:16:15 +00:00
|
|
|
test-touch-events.c \
|
|
|
|
test-rotate-zoom.c
|
2008-11-07 19:32:28 +00:00
|
|
|
|
2008-11-15 15:03:09 +00:00
|
|
|
if X11_TESTS
|
2011-10-17 15:06:15 +00:00
|
|
|
UNIT_TESTS += test-pixmap.c
|
2008-11-15 15:03:09 +00:00
|
|
|
endif
|
|
|
|
|
2012-03-09 14:58:17 +00:00
|
|
|
if PIXBUF_TESTS
|
2012-03-09 16:26:34 +00:00
|
|
|
UNIT_TESTS += \
|
2012-05-01 17:30:10 +00:00
|
|
|
test-image.c
|
2012-03-09 14:58:17 +00:00
|
|
|
endif
|
|
|
|
|
2011-03-25 11:49:44 +00:00
|
|
|
SHEXT = $(EXEEXT)
|
|
|
|
|
2008-11-07 19:32:28 +00:00
|
|
|
# For convenience, this provides a way to easily run individual unit tests:
|
2013-08-16 09:57:54 +00:00
|
|
|
wrappers: stamp-test-interactive
|
2009-11-05 17:30:33 +00:00
|
|
|
@true
|
2011-11-18 16:38:45 +00:00
|
|
|
|
2015-01-01 19:40:18 +00:00
|
|
|
GIT_IGNORE_EXTRA = \
|
|
|
|
stamp-test-interactive \
|
|
|
|
stamp-test-unit-names \
|
|
|
|
test-unit-names.h \
|
|
|
|
$(UNIT_TESTS:.c=$(SHEXT))
|
|
|
|
|
2013-08-16 10:07:35 +00:00
|
|
|
stamp-test-interactive: Makefile
|
|
|
|
@wrapper=$(abs_builddir)/wrapper.sh ; \
|
|
|
|
chmod +x $$wrapper && \
|
2009-11-25 12:25:14 +00:00
|
|
|
for i in $(UNIT_TESTS); \
|
2009-11-05 17:30:33 +00:00
|
|
|
do \
|
|
|
|
test_bin=$${i%*.c} ; \
|
2013-05-15 14:07:15 +00:00
|
|
|
echo " GEN $$test_bin" ; \
|
2009-11-05 17:30:33 +00:00
|
|
|
( echo "#!/bin/sh" ; \
|
2009-11-25 12:25:14 +00:00
|
|
|
echo "$$wrapper $$test_bin \$$@" \
|
2011-03-25 11:49:44 +00:00
|
|
|
) > $$test_bin$(SHEXT) ; \
|
|
|
|
chmod +x $$test_bin$(SHEXT) ; \
|
2009-11-05 17:30:33 +00:00
|
|
|
done \
|
|
|
|
&& echo timestamp > $(@F)
|
|
|
|
|
2011-09-27 16:40:51 +00:00
|
|
|
test-unit-names.h: stamp-test-unit-names
|
|
|
|
@true
|
|
|
|
|
2015-01-01 19:40:18 +00:00
|
|
|
stamp-test-unit-names: Makefile
|
2011-09-27 16:40:51 +00:00
|
|
|
@( echo "/* ** This file is autogenerated. Do not edit. ** */" ; \
|
|
|
|
echo "" ; \
|
|
|
|
echo "const char *test_unit_names[] = {" ) > test-unit-names.h ; \
|
|
|
|
for i in $(UNIT_TESTS); \
|
|
|
|
do \
|
|
|
|
test_bin=$${i%*.c} ; \
|
|
|
|
echo " \"$$test_bin\"," >> test-unit-names.h ; \
|
|
|
|
done \
|
|
|
|
&& echo "};" >> test-unit-names.h \
|
|
|
|
&& echo timestamp > $(@F)
|
|
|
|
|
2009-11-05 17:30:33 +00:00
|
|
|
clean-wrappers:
|
|
|
|
@for i in $(UNIT_TESTS); \
|
2008-11-07 19:32:28 +00:00
|
|
|
do \
|
2009-11-05 17:30:33 +00:00
|
|
|
test_bin=$${i%*.c} ; \
|
2013-05-15 14:07:15 +00:00
|
|
|
echo " RM $$test_bin"; \
|
2011-03-25 11:49:44 +00:00
|
|
|
rm -f $$test_bin$(SHEXT); \
|
2009-11-05 17:30:33 +00:00
|
|
|
done \
|
2011-11-22 12:11:06 +00:00
|
|
|
&& rm -f stamp-test-unit-names \
|
2009-11-05 17:30:33 +00:00
|
|
|
&& rm -f stamp-test-interactive
|
2008-11-08 15:56:22 +00:00
|
|
|
|
2009-11-05 17:30:33 +00:00
|
|
|
.PHONY: wrappers clean-wrappers
|
2008-11-07 19:32:28 +00:00
|
|
|
|
2016-08-08 13:52:36 +00:00
|
|
|
common_ldadd = \
|
|
|
|
$(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la \
|
|
|
|
$(top_builddir)/../cogl/cogl/libmutter-cogl.la
|
2008-11-07 19:32:28 +00:00
|
|
|
|
2013-08-16 09:57:54 +00:00
|
|
|
check_PROGRAMS = test-interactive
|
2016-01-12 16:23:09 +00:00
|
|
|
check_SCRIPTS = wrappers
|
2008-11-07 19:32:28 +00:00
|
|
|
|
2012-05-28 14:33:01 +00:00
|
|
|
test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
|
|
|
|
nodist_test_interactive_SOURCES = test-unit-names.h
|
2012-03-09 14:58:17 +00:00
|
|
|
test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS)
|
2009-11-05 17:30:33 +00:00
|
|
|
test_interactive_CPPFLAGS = \
|
Fully rework the conformance test suite
The current conformance test suite is suboptimal in many ways.
All tests are built into the same binary, which makes adding new tests,
builting tests, and running groups of tests much more awkward than it
needs to be. The first issue, especially, raises the bar of contribution
in a significant way, while the other two take their toll on the
maintainer. All of these changes were introduced back when we had both
Clutter and Cogl tests in tree, and because we were building the test
suite for every single change; since then, Cogl moved out of tree with
all its tests, and we build the conformance test suite only when running
the `check` make target.
This admittedly large-ish commit changes the way the conformance test
suite works, taking advantage of the changes in the GTest API and test
harness.
First of all, all tests are now built separately, using their own test
suite as defined by each separate file. All tests run under the TAP
harness provided by GTest and Automake, to gather a proper report using
the Test Anything Protocol without using the `gtester` harness and the
`gtester-report` script. We also use the Makefile rules provided by GLib
to vastly simplify the build environment for the conformance test suite.
On top of the changes for the build and harness, we also provide new API
for creating and running test suites for Clutter. The API is public,
because the test suite has to use it, but it's minimal and mostly
provides convenience wrappers around GTest that make writing test units
for Clutter easier.
This commit disables all tests in the conformance test suite, as well as
moving the data files outside of the tests/data directory; the next few
commits will re-establish the conformance test suite separately so we
can check that everything works in a reliable way.
2013-12-12 14:36:16 +00:00
|
|
|
-DTESTS_DATADIR=\""$(abs_srcdir)"\" \
|
2010-09-10 12:41:49 +00:00
|
|
|
-DG_DISABLE_SINGLE_INCLUDES \
|
2011-10-13 16:50:25 +00:00
|
|
|
-DGLIB_DISABLE_DEPRECATION_WARNINGS \
|
2013-07-02 21:24:31 +00:00
|
|
|
-DCOGL_DISABLE_DEPRECATION_WARNINGS \
|
2013-05-15 14:18:13 +00:00
|
|
|
-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
|
2016-04-08 17:58:20 +00:00
|
|
|
-I$(top_srcdir)/../cogl \
|
|
|
|
-I$(top_builddir)/../cogl \
|
2013-05-15 14:18:13 +00:00
|
|
|
-I$(top_srcdir) \
|
|
|
|
-I$(top_builddir) \
|
|
|
|
-I$(top_srcdir)/clutter \
|
|
|
|
-I$(top_builddir)/clutter
|
2008-11-07 19:32:28 +00:00
|
|
|
test_interactive_LDFLAGS = -export-dynamic
|
2015-03-03 17:23:37 +00:00
|
|
|
test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) $(LIBM)
|
2009-08-03 13:53:46 +00:00
|
|
|
|
2011-11-18 17:08:01 +00:00
|
|
|
EXTRA_DIST = \
|
Fully rework the conformance test suite
The current conformance test suite is suboptimal in many ways.
All tests are built into the same binary, which makes adding new tests,
builting tests, and running groups of tests much more awkward than it
needs to be. The first issue, especially, raises the bar of contribution
in a significant way, while the other two take their toll on the
maintainer. All of these changes were introduced back when we had both
Clutter and Cogl tests in tree, and because we were building the test
suite for every single change; since then, Cogl moved out of tree with
all its tests, and we build the conformance test suite only when running
the `check` make target.
This admittedly large-ish commit changes the way the conformance test
suite works, taking advantage of the changes in the GTest API and test
harness.
First of all, all tests are now built separately, using their own test
suite as defined by each separate file. All tests run under the TAP
harness provided by GTest and Automake, to gather a proper report using
the Test Anything Protocol without using the `gtester` harness and the
`gtester-report` script. We also use the Makefile rules provided by GLib
to vastly simplify the build environment for the conformance test suite.
On top of the changes for the build and harness, we also provide new API
for creating and running test suites for Clutter. The API is public,
because the test suite has to use it, but it's minimal and mostly
provides convenience wrappers around GTest that make writing test units
for Clutter easier.
This commit disables all tests in the conformance test suite, as well as
moving the data files outside of the tests/data directory; the next few
commits will re-establish the conformance test suite separately so we
can check that everything works in a reliable way.
2013-12-12 14:36:16 +00:00
|
|
|
wrapper.sh.in \
|
|
|
|
test-script.json \
|
|
|
|
test-script-signals.json \
|
|
|
|
redhand.png
|
2011-11-18 17:08:01 +00:00
|
|
|
|
2011-09-27 16:40:51 +00:00
|
|
|
DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
|
2010-08-15 17:42:54 +00:00
|
|
|
|
2013-08-16 09:57:54 +00:00
|
|
|
BUILT_SOURCES = test-unit-names.h
|
2009-11-05 17:30:33 +00:00
|
|
|
|
|
|
|
clean-local: clean-wrappers
|