filechooserbutton: Don't duplicate tests for GTK_RESPONSE_DELETE_EVENT

[~andy/gtk] / gtk / tests / Makefile.am

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 8187927610854e55acf78eceed0902ca7c79e2c0..b28105d2b83d7f284e5a197f237b4d238405714a 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -54,14 +54,12 @@ TEST_PROGS                  += floating
 floating_SOURCES                = floating.c
 floating_LDADD                  = $(progs_ldadd)
 
-# This doesn't work, see:
-# https://bugzilla.gnome.org/show_bug.cgi?id=662755
-#TEST_PROGS                    += accel
-#accel_SOURCES                  = accel.c
-#accel_LDADD                    = $(progs_ldadd)
+TEST_PROGS                     += accel
+accel_SOURCES                   = accel.c
+accel_LDADD                     = $(progs_ldadd)
 
 #TEST_PROGS                    += object
-#object_SOURCES                         = object.c pixbuf-init.c
+#object_SOURCES                         = object.c
 #object_LDADD                   = $(progs_ldadd)
 
 # this doesn't work in make distcheck, since running
@@ -71,10 +69,9 @@ floating_LDADD                        = $(progs_ldadd)
 #crossingevents_SOURCES                 = crossingevents.c
 #crossingevents_LDADD           = $(progs_ldadd)
 
-# Should be ported to new API's
-#TEST_PROGS                    += filechooser
-#filechooser_SOURCES            = filechooser.c pixbuf-init.c
-#filechooser_LDADD              = $(progs_ldadd)
+TEST_PROGS                     += filechooser
+filechooser_SOURCES             = filechooser.c
+filechooser_LDADD               = $(progs_ldadd)
 
 TEST_PROGS                     += builder
 builder_SOURCES                         = builder.c
@@ -83,12 +80,12 @@ builder_LDFLAGS                      = -export-dynamic
 
 if OS_UNIX
 #TEST_PROGS                    += defaultvalue
-#defaultvalue_SOURCES           = defaultvalue.c pixbuf-init.c
+#defaultvalue_SOURCES           = defaultvalue.c
 #defaultvalue_LDADD             = $(progs_ldadd)
 endif
 
 TEST_PROGS                     += textbuffer
-textbuffer_SOURCES              = textbuffer.c pixbuf-init.c
+textbuffer_SOURCES              = textbuffer.c
 textbuffer_LDADD                = $(progs_ldadd)
 
 TEST_PROGS                     += textiter
@@ -131,6 +128,34 @@ TEST_PROGS                 += grid
 grid_SOURCES                    = grid.c
 grid_LDADD                      = $(progs_ldadd)
 
+TEST_PROGS                     += rbtree
+rbtree_CFLAGS                   = -DGTK_COMPILATION -UG_ENABLE_DEBUG
+rbtree_SOURCES                  = rbtree.c ../gtkrbtree.h ../gtkrbtree.c
+rbtree_LDADD                    = $(GTK_DEP_LIBS)
+
+TEST_PROGS                     += bitmask
+bitmask_CFLAGS                  = -DGTK_COMPILATION -UG_ENABLE_DEBUG
+bitmask_SOURCES                         = bitmask.c \
+                                  ../gtkbitmaskprivate.h \
+                                  ../gtkallocatedbitmaskprivate.h \
+                                  ../gtkallocatedbitmask.c
+bitmask_LDADD                   = $(GTK_DEP_LIBS)
+
+TEST_PROGS                     += regression-tests
+regression_tests_SOURCES        = regression-tests.c
+regression_tests_LDADD          = $(progs_ldadd)
+
+TEST_PROGS                     += keyhash
+keyhash_SOURCES                         = keyhash.c \
+                                  ../gtkkeyhash.c ../gtkkeyhash.h \
+                                  ../gtkprivate.c ../gtkprivate.h
+keyhash_LDADD                   = $(progs_ldadd)
+keyhash_CFLAGS                  = -DGTK_COMPILATION \
+                                  -DGTK_LIBDIR=\"$(libdir)\" \
+                                  -DGTK_DATADIR=\"$(datadir)\" \
+                                  -DGTK_DATA_PREFIX=\"$(prefix)\" \
+                                  -DGTK_SYSCONFDIR=\"$(sysconfdir)\"
+
 EXTRA_DIST +=                          \
        file-chooser-test-dir/empty     \
        file-chooser-test-dir/text.txt