summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-04-03 18:48:46 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-04-03 18:48:46 +0000
commitaf5c897e4ba03e96ca35f7e8f20438fd9336969d (patch)
treef6f8859aeab270a9f67626962e8ee2ae52973c28 /tests
parent748560e1fcccc046183f82818960ca53f0b69295 (diff)
downloadgdk-pixbuf-af5c897e4ba03e96ca35f7e8f20438fd9336969d.tar.gz
Updated.
Tue Apr 3 13:55:37 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Remove support for uninstalled glib. * gtk/gtkdnd.c (gtk_drag_highlight_expose): Return FALSE as so as not to stop emission. * gtk-config-2.0.in: Exit with an error message that gtk-config-2.0 is no longer supported. * Makefile.am gtk/Makefile.am tests/*: Moved all tests into tests, change build order to build modules before gtk/. * modules/input/Makefile.am: Move gtk-query-immodules-2.0 invocation to here.
Diffstat (limited to 'tests')
-rw-r--r--tests/.cvsignore8
-rw-r--r--tests/Makefile.am50
-rw-r--r--tests/testgtk.c2
-rw-r--r--tests/testinput.c2
-rw-r--r--tests/testrgb.c2
-rw-r--r--tests/testselection.c2
-rw-r--r--tests/testtextbuffer.c3
7 files changed, 63 insertions, 6 deletions
diff --git a/tests/.cvsignore b/tests/.cvsignore
index 0186a11be..450c6d654 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -4,8 +4,16 @@ makefile.mingw
makefile.msc
.deps
.libs
+simple
+testcalendar
+testgtk
+testinput
+testrgb
+testselection
+testtext
testtreeview
testtreecolumns
testsocket
testsocket_child
testtreefocus
+treestoretest
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d60330472..5c000571e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,24 +31,72 @@ LDADDS = @STRIP_BEGIN@ \
@STRIP_END@
noinst_PROGRAMS = \
+ simple \
+ testcalendar \
+ testdnd \
+ testgtk \
+ testinput \
+ testrgb \
+ testselection \
## testsocket \
## testsocket_child \
+ testtext \
+ testtextbuffer \
testtreeview \
testtreefocus \
testtreecolumns \
- testtreesort
+ testtreesort \
+ treestoretest
#testsocket_DEPENDENCIES = $(DEPS)
#testsocket_child_DEPENDENCIES = $(DEPS)
+simple_DEPENDENCIES = $(TEST_DEPS)
+testcalendar_DEPENDENCIES = $(TEST_DEPS)
+testdnd_DEPENDENCIES = $(TEST_DEPS)
+testgtk_DEPENDENCIES = $(TEST_DEPS)
+testinput_DEPENDENCIES = $(TEST_DEPS)
+testrgb_DEPENDENCIES = $(TEST_DEPS)
+testselection_DEPENDENCIES = $(TEST_DEPS)
+testtext_DEPENDENCIES = $(TEST_DEPS)
+testtextbuffer_DEPENDENCIES = $(TEST_DEPS)
testtreeview_DEPENDENCIES = $(DEPS)
testtreefocus_DEPENDENCIES = $(DEPS)
testtreecolumns_DEPENDENCIES = $(DEPS)
testtreesort_DEPENDENCIES = $(DEPS)
+treestoretest_DEPENDENCIES = $(TEST_DEPS)
#testsocket_LDADD = $(LDADDS)
#testsocket_child_LDADD = $(LDADDS)
+simple_LDADD = $(LDADDS)
+testcalendar_LDADD = $(LDADDS)
+testdnd_LDADD = $(LDADDS)
+testgtk_LDADD = $(LDADDS)
+testinput_LDADD = $(LDADDS)
+testrgb_LDADD = $(LDADDS)
+testselection_LDADD = $(LDADDS)
+testtextbuffer_LDADD = $(LDADDS)
testtreeview_LDADD = $(LDADDS)
testtreefocus_LDADD = $(LDADDS)
testtreecolumns_LDADD = $(LDADDS)
testtreesort_LDADD = $(LDADDS)
+testtext_LDADD = $(LDADDS)
+treestoretest_LDADD = $(LDADDS)
+
+EXTRA_DIST += @STRIP_BEGIN@ \
+ testgtk.1 \
+ testgtkrc \
+ testgtkrc2 \
+ circles.xbm \
+ 3DRings.xpm \
+ FilesQueue.xpm \
+ Modeller.xpm \
+ check-y.xpm \
+ check-n.xpm \
+ marble.xpm \
+ test.xpm \
+ check-y.xpm \
+ check-n.xpm \
+ test.xpm \
+@STRIP_END@
+
diff --git a/tests/testgtk.c b/tests/testgtk.c
index f1cfb011a..3f7313647 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -39,7 +39,7 @@
#endif
#define GTK_ENABLE_BROKEN
-#include "gtk.h"
+#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h"
diff --git a/tests/testinput.c b/tests/testinput.c
index 4801c3125..eb256bddf 100644
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -25,7 +25,7 @@
*/
#include <stdio.h>
-#include "gtk.h"
+#include "gtk/gtk.h"
/* Backing pixmap for drawing area */
diff --git a/tests/testrgb.c b/tests/testrgb.c
index ccf246b74..12f088f60 100644
--- a/tests/testrgb.c
+++ b/tests/testrgb.c
@@ -38,7 +38,7 @@
#endif
#include <string.h>
-#include "gtk.h"
+#include "gtk/gtk.h"
static void
quit_func (GtkWidget *widget, gpointer dummy)
diff --git a/tests/testselection.c b/tests/testselection.c
index 4f7f6b7e0..99d68f06c 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>
#define GTK_ENABLE_BROKEN
-#include "gtk.h"
+#include "gtk/gtk.h"
typedef enum {
SEL_TYPE_NONE,
diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c
index bc94c69c4..a5525a5c1 100644
--- a/tests/testtextbuffer.c
+++ b/tests/testtextbuffer.c
@@ -1,9 +1,10 @@
/* Simplistic test suite */
+
#include <stdio.h>
#include <gtk/gtk.h>
-#include "gtktextbtree.h"
+#include "../gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */
static void fill_buffer (GtkTextBuffer *buffer);