Files
poky/meta/packages/clutter/clutter/enable_tests.patch
Robert Bradford f3e36a17be Refresh enable_tests.patch for clutter trunk.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4345 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-25 16:23:33 +00:00

49 lines
1.8 KiB
Diff

---
tests/Makefile.am | 7 ++++++-
tests/test-actors.c | 2 +-
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
Index: clutter/tests/Makefile.am
===================================================================
--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100
+++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
test-actors test-behave test-text test-entry test-project \
test-perspective test-rotate test-depth \
test-threads test-timeline test-timeline-dup-frames \
@@ -14,7 +14,7 @@
test-cogl-tex-polygon test-stage-read-pixels
if X11_TESTS
-noinst_PROGRAMS += test-pixmap
+bin_PROGRAMS += test-pixmap
endif
INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
@@ -61,4 +61,9 @@
test_cogl_offscreen_SOURCES = test-cogl-offscreen.c
test_stage_read_pixels_SOURCES = test-stage-read-pixels.c
+test_textdir = $(pkgdatadir)
+test_text_DATA = test-text.c
+test_actorsdir = $(pkgdatadir)
+test_actors_DATA = redhand.png
+
EXTRA_DIST = redhand.png test-script.json
Index: clutter/tests/test-actors.c
===================================================================
--- clutter.orig/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
+++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
@@ -184,7 +184,7 @@
/* Create a texture from file, then clone in to same resources */
if (i == 0)
{
- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
&error)) == NULL)
{
g_error ("image load failed: %s", error->message);