summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Bradford <rob@openedhand.com>2008-04-25 16:23:33 +0000
committerRobert Bradford <rob@openedhand.com>2008-04-25 16:23:33 +0000
commitf3e36a17bec4029a432f66e3b1f9893a186fbae4 (patch)
tree3729904bf8ff1964fedb4c66d0113da6ad2d6e15 /meta
parentdf99aabf64b2ab10cb0a0ed44f129c8cc4bb422e (diff)
downloadpoky-f3e36a17bec4029a432f66e3b1f9893a186fbae4.tar.gz
Refresh enable_tests.patch for clutter trunk.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4345 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/clutter/clutter/enable_tests.patch58
1 files changed, 27 insertions, 31 deletions
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch
index 4f78df5b8b..4a99968fa3 100644
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ b/meta/packages/clutter/clutter/enable_tests.patch
@@ -6,17 +6,26 @@
6 6
7Index: clutter/tests/Makefile.am 7Index: clutter/tests/Makefile.am
8=================================================================== 8===================================================================
9--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000 9--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100
10+++ clutter/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000 10+++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100
11@@ -1,4 +1,4 @@ 11@@ -1,4 +1,4 @@
12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ 12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ 13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
14 test-actors test-behave test-text test-entry test-project \ 14 test-actors test-behave test-text test-entry test-project \
15 test-boxes test-perspective test-rotate test-depth \ 15 test-perspective test-rotate test-depth \
16 test-threads test-timeline test-score test-script 16 test-threads test-timeline test-timeline-dup-frames \
17@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c 17@@ -14,7 +14,7 @@
18 test_score_SOURCES = test-score.c 18 test-cogl-tex-polygon test-stage-read-pixels
19 test_script_SOURCES = test-script.c 19
20 if X11_TESTS
21-noinst_PROGRAMS += test-pixmap
22+bin_PROGRAMS += test-pixmap
23 endif
24
25 INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
26@@ -61,4 +61,9 @@
27 test_cogl_offscreen_SOURCES = test-cogl-offscreen.c
28 test_stage_read_pixels_SOURCES = test-stage-read-pixels.c
20 29
21+test_textdir = $(pkgdatadir) 30+test_textdir = $(pkgdatadir)
22+test_text_DATA = test-text.c 31+test_text_DATA = test-text.c
@@ -26,27 +35,14 @@ Index: clutter/tests/Makefile.am
26 EXTRA_DIST = redhand.png test-script.json 35 EXTRA_DIST = redhand.png test-script.json
27Index: clutter/tests/test-actors.c 36Index: clutter/tests/test-actors.c
28=================================================================== 37===================================================================
29--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000 38--- clutter.orig/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
30+++ clutter/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000 39+++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
31@@ -143,7 +143,7 @@ main (int argc, char *argv[]) 40@@ -184,7 +184,7 @@
32 stage = clutter_stage_get_default (); 41 /* Create a texture from file, then clone in to same resources */
33 clutter_actor_set_size (stage, 800, 600); 42 if (i == 0)
34 43 {
35- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); 44- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
36+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); 45+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
37 46 &error)) == NULL)
38 if (!pixbuf) 47 {
39 g_error("pixbuf load failed"); 48 g_error ("image load failed: %s", error->message);
40Index: clutter/tests/test-text.c
41===================================================================
42--- clutter.orig/tests/test-text.c 2007-11-06 12:29:17.000000000 +0000
43+++ clutter/tests/test-text.c 2007-11-06 12:29:21.000000000 +0000
44@@ -27,7 +27,7 @@ main (int argc, char *argv[])
45
46 stage = clutter_stage_get_default ();
47
48- if (!g_file_get_contents ("test-text.c", &text, &size, NULL))
49+ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL))
50 g_error("g_file_get_contents() of test-text.c failed");
51
52 clutter_actor_set_size (stage, 800, 600);