gtk+ r21048 - in trunk: . gdk/tests

[herzi svn gnome org]

Author: herzi
Date: Fri Aug  8 22:22:26 2008
New Revision: 21048
URL: http://svn.gnome.org/viewvc/gtk+?rev=21048&view=rev

Log:
2008-08-09  Sven Herzberg  <sven imendio com>

	Get the gdk+cairo test to pass distcheck, too

	* gdk/tests/Makefile.am: set GDK_PIXBUF_MODULE_FILE so the test can
	pick up the one created at build time
	* gdk/tests/check-gdk-cairo.c (main): delete the output files after a
	successful test run



Modified:
   trunk/ChangeLog
   trunk/gdk/tests/Makefile.am
   trunk/gdk/tests/check-gdk-cairo.c

Modified: trunk/gdk/tests/Makefile.am
==============================================================================
--- trunk/gdk/tests/Makefile.am	(original)
+++ trunk/gdk/tests/Makefile.am	Fri Aug  8 22:22:26 2008
@@ -2,11 +2,13 @@
 
 NULL=
 
-#check_PROGRAMS=check-gdk-cairo
+check_PROGRAMS=check-gdk-cairo
 TESTS=$(check_PROGRAMS)
+TESTS_ENVIRONMENT=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
 
 AM_CPPFLAGS=\
 	$(GDK_DEP_CFLAGS) \
+	-I$(top_srcdir) \
 	-I$(top_builddir)/gdk \
 	$(NULL)
 

Modified: trunk/gdk/tests/check-gdk-cairo.c
==============================================================================
--- trunk/gdk/tests/check-gdk-cairo.c	(original)
+++ trunk/gdk/tests/check-gdk-cairo.c	Fri Aug  8 22:22:26 2008
@@ -134,6 +134,9 @@
 	g_object_unref (pbuf_platform);
 	g_object_unref (pbuf_imagesrf);
 
+	g_unlink ("gdksurface.png");
+	g_unlink ("cairosurface.png");
+
 	return 0;
 }