From d5565f5b638a39c8c33f290e860a6cc38f5631be Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 18 Jun 2008 13:29:02 +0000 Subject: [PATCH] tests/Makefile.am tests/autotestfilechooser.c tests/buildertest.c 2008-06-18 Michael Natterer * tests/Makefile.am * tests/autotestfilechooser.c * tests/buildertest.c * tests/defaultvaluetest.c * tests/floatingtest.c * tests/objecttests.c * tests/pixbuf-init.c * tests/textbuffertest.c: remove unit tests here... * gtk/tests/Makefile.am * gtk/tests/builder.c * gtk/tests/defaultvalue.c * gtk/tests/filechooser.c * gtk/tests/floating.c * gtk/tests/object.c * gtk/tests/pixbuf-init.c * gtk/tests/textbuffer.c: ...and add them here. svn path=/trunk/; revision=20450 --- ChangeLog | 20 ++++ gtk/tests/Makefile.am | 91 +++++++++++++------ tests/buildertest.c => gtk/tests/builder.c | 0 .../tests/defaultvalue.c | 0 .../tests/filechooser.c | 0 tests/floatingtest.c => gtk/tests/floating.c | 0 tests/objecttests.c => gtk/tests/object.c | 0 {tests => gtk/tests}/pixbuf-init.c | 4 +- .../tests/textbuffer.c | 0 tests/Makefile.am | 28 ------ 10 files changed, 83 insertions(+), 60 deletions(-) rename tests/buildertest.c => gtk/tests/builder.c (100%) rename tests/defaultvaluetest.c => gtk/tests/defaultvalue.c (100%) rename tests/autotestfilechooser.c => gtk/tests/filechooser.c (100%) rename tests/floatingtest.c => gtk/tests/floating.c (100%) rename tests/objecttests.c => gtk/tests/object.c (100%) rename {tests => gtk/tests}/pixbuf-init.c (60%) rename tests/textbuffertest.c => gtk/tests/textbuffer.c (100%) diff --git a/ChangeLog b/ChangeLog index 2932e65f40..2583b12064 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-06-18 Michael Natterer + + * tests/Makefile.am + * tests/autotestfilechooser.c + * tests/buildertest.c + * tests/defaultvaluetest.c + * tests/floatingtest.c + * tests/objecttests.c + * tests/pixbuf-init.c + * tests/textbuffertest.c: remove unit tests here... + + * gtk/tests/Makefile.am + * gtk/tests/builder.c + * gtk/tests/defaultvalue.c + * gtk/tests/filechooser.c + * gtk/tests/floating.c + * gtk/tests/object.c + * gtk/tests/pixbuf-init.c + * gtk/tests/textbuffer.c: ...and add them here. + 2008-06-18 Michael Natterer * gdk/gdk.h: deprecate GdkDestroyNotify. diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index f7479cbe86..b9a5afa45a 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -1,42 +1,73 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + -I$(top_srcdir)/gdk \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) -DEPS = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) +DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) -progs_ldadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) +progs_ldadd = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) noinst_PROGRAMS = $(TEST_PROGS) -TEST_PROGS += testing -testing_SOURCES = testing.c -testing_LDADD = $(progs_ldadd) +TEST_PROGS += testing +testing_SOURCES = testing.c +testing_LDADD = $(progs_ldadd) -TEST_PROGS += liststore -liststore_SOURCES = liststore.c -liststore_LDADD = $(progs_ldadd) +TEST_PROGS += liststore +liststore_SOURCES = liststore.c +liststore_LDADD = $(progs_ldadd) -TEST_PROGS += treestore -treestore_SOURCES = treestore.c -treestore_LDADD = $(progs_ldadd) +TEST_PROGS += treestore +treestore_SOURCES = treestore.c +treestore_LDADD = $(progs_ldadd) -TEST_PROGS += treeview-scrolling -treeview_scrolling_SOURCES = treeview-scrolling.c -treeview_scrolling_LDADD = $(progs_ldadd) +TEST_PROGS += treeview-scrolling +treeview_scrolling_SOURCES = treeview-scrolling.c +treeview_scrolling_LDADD = $(progs_ldadd) -TEST_PROGS += recentmanager -recentmanager_SOURCES = recentmanager.c -recentmanager_LDADD = $(progs_ldadd) +TEST_PROGS += recentmanager +recentmanager_SOURCES = recentmanager.c +recentmanager_LDADD = $(progs_ldadd) + +TEST_PROGS += floating +floating_SOURCES = floating.c +floating_LDADD = $(progs_ldadd) + +TEST_PROGS += object +object_SOURCES = object.c pixbuf-init.c +object_LDADD = $(progs_ldadd) + +# this doesn't work in make distcheck, since it doesn't +# find file-chooser-test-dir +# TEST_PROGS += filechooser +filechooser_SOURCES = filechooser.c pixbuf-init.c +filechooser_LDADD = $(progs_ldadd) + +TEST_PROGS += builder +builder_SOURCES = builder.c +builder_LDADD = $(progs_ldadd) +builder_LDFLAGS = -export-dynamic + +if OS_UNIX +TEST_PROGS += defaultvalue +endif +defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c +defaultvalue_LDADD = $(progs_ldadd) + +TEST_PROGS += textbuffer +textbuffer_SOURCES = textbuffer.c pixbuf-init.c +textbuffer_LDADD = $(progs_ldadd) diff --git a/tests/buildertest.c b/gtk/tests/builder.c similarity index 100% rename from tests/buildertest.c rename to gtk/tests/builder.c diff --git a/tests/defaultvaluetest.c b/gtk/tests/defaultvalue.c similarity index 100% rename from tests/defaultvaluetest.c rename to gtk/tests/defaultvalue.c diff --git a/tests/autotestfilechooser.c b/gtk/tests/filechooser.c similarity index 100% rename from tests/autotestfilechooser.c rename to gtk/tests/filechooser.c diff --git a/tests/floatingtest.c b/gtk/tests/floating.c similarity index 100% rename from tests/floatingtest.c rename to gtk/tests/floating.c diff --git a/tests/objecttests.c b/gtk/tests/object.c similarity index 100% rename from tests/objecttests.c rename to gtk/tests/object.c diff --git a/tests/pixbuf-init.c b/gtk/tests/pixbuf-init.c similarity index 60% rename from tests/pixbuf-init.c rename to gtk/tests/pixbuf-init.c index f4faa9a2d5..17c12239be 100644 --- a/tests/pixbuf-init.c +++ b/gtk/tests/pixbuf-init.c @@ -15,6 +15,6 @@ file_exists (const char *filename) void pixbuf_init (void) { - if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la")) - g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE); + if (file_exists ("../../gdk-pixbuf/libpixbufloader-pnm.la")) + g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE); } diff --git a/tests/textbuffertest.c b/gtk/tests/textbuffer.c similarity index 100% rename from tests/textbuffertest.c rename to gtk/tests/textbuffer.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 00ec732823..edd18b01da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,34 +25,6 @@ if USE_X11 testsocket_programs = testsocket testsocket_child endif -TEST_PROGS += floatingtest -floatingtest_DEPENDENCIES = $(TEST_DEPS) -floatingtest_LDADD = $(LDADDS) -TEST_PROGS += objecttests -objecttests_SOURCES = objecttests.c pixbuf-init.c -objecttests_LDADD = $(LDADDS) -objecttests_DEPENDENCIES = $(TEST_DEPS) -# this doesn't work in make distcheck, since it doesn't -# find file-chooser-test-dir -# TEST_PROGS += autotestfilechooser -autotestfilechooser_DEPENDENCIES = $(TEST_DEPS) -autotestfilechooser_LDADD = $(LDADDS) -autotestfilechooser_SOURCES = autotestfilechooser.c pixbuf-init.c -TEST_PROGS += buildertest -buildertest_DEPENDENCIES = $(TEST_DEPS) -buildertest_LDADD = $(LDADDS) -buildertest_LDFLAGS = -export-dynamic -if OS_UNIX -TEST_PROGS += defaultvaluetest -endif -defaultvaluetest_DEPENDENCIES = $(TEST_DEPS) -defaultvaluetest_LDADD = $(LDADDS) -defaultvaluetest_SOURCES = defaultvaluetest.c pixbuf-init.c -TEST_PROGS += textbuffertest -textbuffertest_DEPENDENCIES = $(TEST_DEPS) -textbuffertest_LDADD = $(LDADDS) -textbuffertest_SOURCES = textbuffertest.c pixbuf-init.c - noinst_PROGRAMS = $(TEST_PROGS) \ simple \ print-editor \