callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Remove gdk-pixbuf hacks

Browse Source 
The code used to check for uninstalled gdk-pixbuf. Since gdk-pixbuf is
an external library these days, those checks aren't necessary anymore.
This commit is contained in:
Benjamin Otte
2012-10-02 17:21:11 +02:00
parent 1b5dabac8b
commit eddac4911f
6 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/tests/Makefile.am
View File

@ -59,7 +59,7 @@ accel_SOURCES = accel.c
accel_LDADD = $(progs_ldadd) accel_LDADD = $(progs_ldadd)
#TEST_PROGS += object #TEST_PROGS += object
#object_SOURCES = object.c pixbuf-init.c #object_SOURCES = object.c
#object_LDADD = $(progs_ldadd) #object_LDADD = $(progs_ldadd)
# this doesn't work in make distcheck, since running # this doesn't work in make distcheck, since running
@ -71,7 +71,7 @@ accel_LDADD = $(progs_ldadd)
# Should be ported to new API's # Should be ported to new API's
#TEST_PROGS += filechooser #TEST_PROGS += filechooser
#filechooser_SOURCES = filechooser.c pixbuf-init.c #filechooser_SOURCES = filechooser.c
#filechooser_LDADD = $(progs_ldadd) #filechooser_LDADD = $(progs_ldadd)
TEST_PROGS += builder TEST_PROGS += builder
@ -81,12 +81,12 @@ builder_LDFLAGS = -export-dynamic
if OS_UNIX if OS_UNIX
#TEST_PROGS += defaultvalue #TEST_PROGS += defaultvalue
#defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c #defaultvalue_SOURCES = defaultvalue.c
#defaultvalue_LDADD = $(progs_ldadd) #defaultvalue_LDADD = $(progs_ldadd)
endif endif
TEST_PROGS += textbuffer TEST_PROGS += textbuffer
textbuffer_SOURCES = textbuffer.c pixbuf-init.c textbuffer_SOURCES = textbuffer.c
textbuffer_LDADD = $(progs_ldadd) textbuffer_LDADD = $(progs_ldadd)
TEST_PROGS += textiter TEST_PROGS += textiter

3
gtk/tests/defaultvalue.c
View File

@ -321,8 +321,6 @@ test_type (gconstpointer data)
g_type_class_unref (klass); g_type_class_unref (klass);
} }
extern void pixbuf_init (void);
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -330,7 +328,6 @@ main (int argc, char **argv)
guint i; guint i;
gtk_test_init (&argc, &argv); gtk_test_init (&argc, &argv);
pixbuf_init ();
gtk_test_register_all_types(); gtk_test_register_all_types();
otypes = gtk_test_list_all_types (NULL); otypes = gtk_test_list_all_types (NULL);

3
gtk/tests/filechooser.c
View File

@ -1065,13 +1065,10 @@ test_folder_switch_and_filters (void)
log_test (passed, "test_folder_switch_and_filters(): all filter tests"); log_test (passed, "test_folder_switch_and_filters(): all filter tests");
} }
extern void pixbuf_init (void);
int int
main (int argc, main (int argc,
char **argv) char **argv)
{ {
pixbuf_init ();
/* initialize test program */ /* initialize test program */
gtk_test_init (&argc, &argv); gtk_test_init (&argc, &argv);

3
gtk/tests/object.c
View File

@ -304,8 +304,6 @@ widget_property_tests (gconstpointer test_data)
g_object_unref (widget); g_object_unref (widget);
} }
extern void pixbuf_init (void);
/* --- main test program --- */ /* --- main test program --- */
int int
main (int argc, main (int argc,
@ -314,7 +312,6 @@ main (int argc,
const GType *otypes; const GType *otypes;
guint i; guint i;
/* initialize test program */ /* initialize test program */
pixbuf_init ();
gtk_test_init (&argc, &argv); gtk_test_init (&argc, &argv);
gtk_test_register_all_types (); gtk_test_register_all_types ();
/* install a property test for each widget type */ /* install a property test for each widget type */

20
gtk/tests/pixbuf-init.c
View File

@ -1,20 +0,0 @@
#include "config.h"
#include <glib.h>
#include <sys/stat.h>
#include <stdlib.h>
static gboolean
file_exists (const char *filename)
{
struct stat statbuf;
return stat (filename, &statbuf) == 0;
}
void
pixbuf_init (void)
{
if (file_exists ("../../gdk-pixbuf/libpixbufloader-pnm.la"))
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
}

3
gtk/tests/textbuffer.c
View File

@ -1319,8 +1319,6 @@ test_tag (void)
g_object_unref (buffer); g_object_unref (buffer);
} }
extern void pixbuf_init (void);
int int
main (int argc, char** argv) main (int argc, char** argv)
{ {
@ -1328,7 +1326,6 @@ main (int argc, char** argv)
gtk_set_debug_flags (gtk_get_debug_flags () | GTK_DEBUG_TEXT); gtk_set_debug_flags (gtk_get_debug_flags () | GTK_DEBUG_TEXT);
gtk_test_init (&argc, &argv); gtk_test_init (&argc, &argv);
pixbuf_init ();
g_test_add_func ("/TextBuffer/UTF8 unknown char", test_utf8); g_test_add_func ("/TextBuffer/UTF8 unknown char", test_utf8);
g_test_add_func ("/TextBuffer/Line separator", test_line_separator); g_test_add_func ("/TextBuffer/Line separator", test_line_separator);