summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--gtk/Makefile.am2
-rw-r--r--testsuite/Makefile.am2
-rw-r--r--testsuite/gtk/Makefile.am (renamed from gtk/tests/Makefile.am)0
-rw-r--r--testsuite/gtk/accel.c (renamed from gtk/tests/accel.c)0
-rw-r--r--testsuite/gtk/accessible.c (renamed from gtk/tests/accessible.c)0
-rw-r--r--testsuite/gtk/action.c (renamed from gtk/tests/action.c)0
-rw-r--r--testsuite/gtk/bitmask.c (renamed from gtk/tests/bitmask.c)0
-rw-r--r--testsuite/gtk/builder.c (renamed from gtk/tests/builder.c)0
-rw-r--r--testsuite/gtk/cellarea.c (renamed from gtk/tests/cellarea.c)0
-rw-r--r--testsuite/gtk/crossingevents.c (renamed from gtk/tests/crossingevents.c)0
-rw-r--r--testsuite/gtk/defaultvalue.c (renamed from gtk/tests/defaultvalue.c)0
-rw-r--r--testsuite/gtk/entry.c (renamed from gtk/tests/entry.c)0
-rw-r--r--testsuite/gtk/expander.c (renamed from gtk/tests/expander.c)0
-rw-r--r--testsuite/gtk/file-chooser-test-dir/empty (renamed from gtk/tests/file-chooser-test-dir/empty)0
-rw-r--r--testsuite/gtk/file-chooser-test-dir/text.txt (renamed from gtk/tests/file-chooser-test-dir/text.txt)0
-rw-r--r--testsuite/gtk/filechooser.c (renamed from gtk/tests/filechooser.c)0
-rw-r--r--testsuite/gtk/filtermodel.c (renamed from gtk/tests/filtermodel.c)0
-rw-r--r--testsuite/gtk/floating.c (renamed from gtk/tests/floating.c)0
-rw-r--r--testsuite/gtk/grid.c (renamed from gtk/tests/grid.c)0
-rw-r--r--testsuite/gtk/gtkmenu.c (renamed from gtk/tests/gtkmenu.c)0
-rw-r--r--testsuite/gtk/gtktreemodelrefcount.c (renamed from gtk/tests/gtktreemodelrefcount.c)0
-rw-r--r--testsuite/gtk/gtktreemodelrefcount.h (renamed from gtk/tests/gtktreemodelrefcount.h)0
-rw-r--r--testsuite/gtk/keyhash.c (renamed from gtk/tests/keyhash.c)0
-rw-r--r--testsuite/gtk/liststore.c (renamed from gtk/tests/liststore.c)0
-rw-r--r--testsuite/gtk/modelrefcount.c (renamed from gtk/tests/modelrefcount.c)0
-rw-r--r--testsuite/gtk/object.c (renamed from gtk/tests/object.c)0
-rw-r--r--testsuite/gtk/objects-finalize.c (renamed from gtk/tests/objects-finalize.c)0
-rw-r--r--testsuite/gtk/papersize.c (renamed from gtk/tests/papersize.c)0
-rw-r--r--testsuite/gtk/rbtree.c (renamed from gtk/tests/rbtree.c)0
-rw-r--r--testsuite/gtk/recentmanager.c (renamed from gtk/tests/recentmanager.c)0
-rw-r--r--testsuite/gtk/regression-tests.c (renamed from gtk/tests/regression-tests.c)0
-rw-r--r--testsuite/gtk/sortmodel.c (renamed from gtk/tests/sortmodel.c)0
-rw-r--r--testsuite/gtk/stylecontext.c (renamed from gtk/tests/stylecontext.c)0
-rw-r--r--testsuite/gtk/templates.c (renamed from gtk/tests/templates.c)0
-rw-r--r--testsuite/gtk/testing.c (renamed from gtk/tests/testing.c)0
-rw-r--r--testsuite/gtk/textbuffer.c (renamed from gtk/tests/textbuffer.c)0
-rw-r--r--testsuite/gtk/textiter.c (renamed from gtk/tests/textiter.c)0
-rw-r--r--testsuite/gtk/treemodel.c (renamed from gtk/tests/treemodel.c)0
-rw-r--r--testsuite/gtk/treemodel.h (renamed from gtk/tests/treemodel.h)0
-rw-r--r--testsuite/gtk/treepath.c (renamed from gtk/tests/treepath.c)0
-rw-r--r--testsuite/gtk/treestore.c (renamed from gtk/tests/treestore.c)0
-rw-r--r--testsuite/gtk/treeview-scrolling.c (renamed from gtk/tests/treeview-scrolling.c)0
-rw-r--r--testsuite/gtk/treeview.c (renamed from gtk/tests/treeview.c)0
-rw-r--r--testsuite/gtk/window.c (renamed from gtk/tests/window.c)0
45 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 6ee3c05731..7a0fbbf7ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1787,6 +1787,7 @@ tests/reftests/Makefile
tests/visuals/Makefile
testsuite/Makefile
testsuite/gdk/Makefile
+testsuite/gtk/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/gdk/Makefile
@@ -1816,7 +1817,6 @@ gtk/gtkversion.h
gtk/gtk-win32.rc
gtk/a11y/Makefile
gtk/native/Makefile
-gtk/tests/Makefile
libgail-util/Makefile
modules/Makefile
modules/engines/Makefile
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 60fbc31e18..a726377f18 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ else
GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
endif
-SUBDIRS = a11y native . tests
+SUBDIRS = a11y native .
if HAVE_PAPI_CUPS
GTK_PRINT_BACKENDS=file,papi,cups
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index af7953b92a..11f7e79c9e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-SUBDIRS = gdk
+SUBDIRS = gdk gtk
-include $(top_srcdir)/git.mk
diff --git a/gtk/tests/Makefile.am b/testsuite/gtk/Makefile.am
index ea5b759384..ea5b759384 100644
--- a/gtk/tests/Makefile.am
+++ b/testsuite/gtk/Makefile.am
diff --git a/gtk/tests/accel.c b/testsuite/gtk/accel.c
index d7ceb94f0e..d7ceb94f0e 100644
--- a/gtk/tests/accel.c
+++ b/testsuite/gtk/accel.c
diff --git a/gtk/tests/accessible.c b/testsuite/gtk/accessible.c
index 03668c32ae..03668c32ae 100644
--- a/gtk/tests/accessible.c
+++ b/testsuite/gtk/accessible.c
diff --git a/gtk/tests/action.c b/testsuite/gtk/action.c
index df8c44523a..df8c44523a 100644
--- a/gtk/tests/action.c
+++ b/testsuite/gtk/action.c
diff --git a/gtk/tests/bitmask.c b/testsuite/gtk/bitmask.c
index 7d186a986a..7d186a986a 100644
--- a/gtk/tests/bitmask.c
+++ b/testsuite/gtk/bitmask.c
diff --git a/gtk/tests/builder.c b/testsuite/gtk/builder.c
index e924a9a61b..e924a9a61b 100644
--- a/gtk/tests/builder.c
+++ b/testsuite/gtk/builder.c
diff --git a/gtk/tests/cellarea.c b/testsuite/gtk/cellarea.c
index 98072ed046..98072ed046 100644
--- a/gtk/tests/cellarea.c
+++ b/testsuite/gtk/cellarea.c
diff --git a/gtk/tests/crossingevents.c b/testsuite/gtk/crossingevents.c
index be210f3c17..be210f3c17 100644
--- a/gtk/tests/crossingevents.c
+++ b/testsuite/gtk/crossingevents.c
diff --git a/gtk/tests/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index ce1ad3b613..ce1ad3b613 100644
--- a/gtk/tests/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
diff --git a/gtk/tests/entry.c b/testsuite/gtk/entry.c
index 074f5a5886..074f5a5886 100644
--- a/gtk/tests/entry.c
+++ b/testsuite/gtk/entry.c
diff --git a/gtk/tests/expander.c b/testsuite/gtk/expander.c
index 87b915f683..87b915f683 100644
--- a/gtk/tests/expander.c
+++ b/testsuite/gtk/expander.c
diff --git a/gtk/tests/file-chooser-test-dir/empty b/testsuite/gtk/file-chooser-test-dir/empty
index e69de29bb2..e69de29bb2 100644
--- a/gtk/tests/file-chooser-test-dir/empty
+++ b/testsuite/gtk/file-chooser-test-dir/empty
diff --git a/gtk/tests/file-chooser-test-dir/text.txt b/testsuite/gtk/file-chooser-test-dir/text.txt
index cd0875583a..cd0875583a 100644
--- a/gtk/tests/file-chooser-test-dir/text.txt
+++ b/testsuite/gtk/file-chooser-test-dir/text.txt
diff --git a/gtk/tests/filechooser.c b/testsuite/gtk/filechooser.c
index 529f87d46b..529f87d46b 100644
--- a/gtk/tests/filechooser.c
+++ b/testsuite/gtk/filechooser.c
diff --git a/gtk/tests/filtermodel.c b/testsuite/gtk/filtermodel.c
index dcacf8d587..dcacf8d587 100644
--- a/gtk/tests/filtermodel.c
+++ b/testsuite/gtk/filtermodel.c
diff --git a/gtk/tests/floating.c b/testsuite/gtk/floating.c
index 89add67f49..89add67f49 100644
--- a/gtk/tests/floating.c
+++ b/testsuite/gtk/floating.c
diff --git a/gtk/tests/grid.c b/testsuite/gtk/grid.c
index 436cfa30f2..436cfa30f2 100644
--- a/gtk/tests/grid.c
+++ b/testsuite/gtk/grid.c
diff --git a/gtk/tests/gtkmenu.c b/testsuite/gtk/gtkmenu.c
index e2667ba135..e2667ba135 100644
--- a/gtk/tests/gtkmenu.c
+++ b/testsuite/gtk/gtkmenu.c
diff --git a/gtk/tests/gtktreemodelrefcount.c b/testsuite/gtk/gtktreemodelrefcount.c
index 7f29f994e1..7f29f994e1 100644
--- a/gtk/tests/gtktreemodelrefcount.c
+++ b/testsuite/gtk/gtktreemodelrefcount.c
diff --git a/gtk/tests/gtktreemodelrefcount.h b/testsuite/gtk/gtktreemodelrefcount.h
index a4b4011a24..a4b4011a24 100644
--- a/gtk/tests/gtktreemodelrefcount.h
+++ b/testsuite/gtk/gtktreemodelrefcount.h
diff --git a/gtk/tests/keyhash.c b/testsuite/gtk/keyhash.c
index 5bca1de98c..5bca1de98c 100644
--- a/gtk/tests/keyhash.c
+++ b/testsuite/gtk/keyhash.c
diff --git a/gtk/tests/liststore.c b/testsuite/gtk/liststore.c
index 4455a13dff..4455a13dff 100644
--- a/gtk/tests/liststore.c
+++ b/testsuite/gtk/liststore.c
diff --git a/gtk/tests/modelrefcount.c b/testsuite/gtk/modelrefcount.c
index 2d39d9c227..2d39d9c227 100644
--- a/gtk/tests/modelrefcount.c
+++ b/testsuite/gtk/modelrefcount.c
diff --git a/gtk/tests/object.c b/testsuite/gtk/object.c
index 1e06dede8f..1e06dede8f 100644
--- a/gtk/tests/object.c
+++ b/testsuite/gtk/object.c
diff --git a/gtk/tests/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index 0e1eae000c..0e1eae000c 100644
--- a/gtk/tests/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
diff --git a/gtk/tests/papersize.c b/testsuite/gtk/papersize.c
index 6af7acc643..6af7acc643 100644
--- a/gtk/tests/papersize.c
+++ b/testsuite/gtk/papersize.c
diff --git a/gtk/tests/rbtree.c b/testsuite/gtk/rbtree.c
index d73d862f13..d73d862f13 100644
--- a/gtk/tests/rbtree.c
+++ b/testsuite/gtk/rbtree.c
diff --git a/gtk/tests/recentmanager.c b/testsuite/gtk/recentmanager.c
index 84b7c670b8..84b7c670b8 100644
--- a/gtk/tests/recentmanager.c
+++ b/testsuite/gtk/recentmanager.c
diff --git a/gtk/tests/regression-tests.c b/testsuite/gtk/regression-tests.c
index e44eaa65a0..e44eaa65a0 100644
--- a/gtk/tests/regression-tests.c
+++ b/testsuite/gtk/regression-tests.c
diff --git a/gtk/tests/sortmodel.c b/testsuite/gtk/sortmodel.c
index a24f8a3630..a24f8a3630 100644
--- a/gtk/tests/sortmodel.c
+++ b/testsuite/gtk/sortmodel.c
diff --git a/gtk/tests/stylecontext.c b/testsuite/gtk/stylecontext.c
index 3435ce41a1..3435ce41a1 100644
--- a/gtk/tests/stylecontext.c
+++ b/testsuite/gtk/stylecontext.c
diff --git a/gtk/tests/templates.c b/testsuite/gtk/templates.c
index 32c1e68080..32c1e68080 100644
--- a/gtk/tests/templates.c
+++ b/testsuite/gtk/templates.c
diff --git a/gtk/tests/testing.c b/testsuite/gtk/testing.c
index ed67615ae4..ed67615ae4 100644
--- a/gtk/tests/testing.c
+++ b/testsuite/gtk/testing.c
diff --git a/gtk/tests/textbuffer.c b/testsuite/gtk/textbuffer.c
index e26a5ddfa8..e26a5ddfa8 100644
--- a/gtk/tests/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
diff --git a/gtk/tests/textiter.c b/testsuite/gtk/textiter.c
index bee33de5f7..bee33de5f7 100644
--- a/gtk/tests/textiter.c
+++ b/testsuite/gtk/textiter.c
diff --git a/gtk/tests/treemodel.c b/testsuite/gtk/treemodel.c
index 13eeb4f770..13eeb4f770 100644
--- a/gtk/tests/treemodel.c
+++ b/testsuite/gtk/treemodel.c
diff --git a/gtk/tests/treemodel.h b/testsuite/gtk/treemodel.h
index 3723057dbf..3723057dbf 100644
--- a/gtk/tests/treemodel.h
+++ b/testsuite/gtk/treemodel.h
diff --git a/gtk/tests/treepath.c b/testsuite/gtk/treepath.c
index c014de2c5f..c014de2c5f 100644
--- a/gtk/tests/treepath.c
+++ b/testsuite/gtk/treepath.c
diff --git a/gtk/tests/treestore.c b/testsuite/gtk/treestore.c
index d19297f5bf..d19297f5bf 100644
--- a/gtk/tests/treestore.c
+++ b/testsuite/gtk/treestore.c
diff --git a/gtk/tests/treeview-scrolling.c b/testsuite/gtk/treeview-scrolling.c
index 77dca9abc4..77dca9abc4 100644
--- a/gtk/tests/treeview-scrolling.c
+++ b/testsuite/gtk/treeview-scrolling.c
diff --git a/gtk/tests/treeview.c b/testsuite/gtk/treeview.c
index 34676a5422..34676a5422 100644
--- a/gtk/tests/treeview.c
+++ b/testsuite/gtk/treeview.c
diff --git a/gtk/tests/window.c b/testsuite/gtk/window.c
index 74fa6eb353..74fa6eb353 100644
--- a/gtk/tests/window.c
+++ b/testsuite/gtk/window.c