summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2013-05-14 16:13:16 +0200
committerBenjamin Otte <otte@redhat.com>2013-05-15 15:37:16 +0200
commit6ea4c144ddfdf1208b44845dee1a40c2eec91e65 (patch)
tree118f9802953b86bf99a83e086688cc253ca56d65
parentac8f7f0703a9f43dfeeba8606ff76f12b7cf8e28 (diff)
downloadgtk+-6ea4c144ddfdf1208b44845dee1a40c2eec91e65.tar.gz
build: Move gdk/tests/ to testsuite/gdk/
This is a reorganization of the testsuite to be in the testsuite/ directory, so it can be installed from there.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--gdk/Makefile.am4
-rw-r--r--testsuite/Makefile.am6
-rw-r--r--testsuite/gdk/Makefile.am (renamed from gdk/tests/Makefile.am)0
-rw-r--r--testsuite/gdk/check-gdk-cairo.c (renamed from gdk/tests/check-gdk-cairo.c)0
-rw-r--r--testsuite/gdk/display.c (renamed from gdk/tests/display.c)0
-rw-r--r--testsuite/gdk/display.test.in (renamed from gdk/tests/display.test.in)0
-rw-r--r--testsuite/gdk/encoding.c (renamed from gdk/tests/encoding.c)0
-rw-r--r--testsuite/gdk/encoding.test.in (renamed from gdk/tests/encoding.test.in)0
-rw-r--r--testsuite/gdk/keysyms.c (renamed from gdk/tests/keysyms.c)0
-rw-r--r--testsuite/gdk/keysyms.test.in (renamed from gdk/tests/keysyms.test.in)0
-rw-r--r--testsuite/gdk/rgba.c (renamed from gdk/tests/rgba.c)0
-rw-r--r--testsuite/gdk/rgba.test.in (renamed from gdk/tests/rgba.test.in)0
14 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 285785fee8..281b67d4f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite perf examples
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 9b90e38009..6ee3c05731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1785,6 +1785,8 @@ tests/css/Makefile
tests/css/parser/Makefile
tests/reftests/Makefile
tests/visuals/Makefile
+testsuite/Makefile
+testsuite/gdk/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/gdk/Makefile
@@ -1807,7 +1809,6 @@ gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
gdk/quartz/Makefile
gdk/wayland/Makefile
-gdk/tests/Makefile
gdk/gdkversionmacros.h
gtk/Makefile
gtk/makefile.msc
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 379ea28af1..7cdae7d57a 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -9,9 +9,9 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=.
-SUBDIRS = $(GDK_BACKENDS) . tests
+SUBDIRS = $(GDK_BACKENDS) .
-DIST_SUBDIRS = win32 x11 quartz broadway wayland tests
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
CLEANFILES =
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
new file mode 100644
index 0000000000..af7953b92a
--- /dev/null
+++ b/testsuite/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = gdk
+
+-include $(top_srcdir)/git.mk
+
diff --git a/gdk/tests/Makefile.am b/testsuite/gdk/Makefile.am
index bd9a3b392f..bd9a3b392f 100644
--- a/gdk/tests/Makefile.am
+++ b/testsuite/gdk/Makefile.am
diff --git a/gdk/tests/check-gdk-cairo.c b/testsuite/gdk/check-gdk-cairo.c
index cc7987cc03..cc7987cc03 100644
--- a/gdk/tests/check-gdk-cairo.c
+++ b/testsuite/gdk/check-gdk-cairo.c
diff --git a/gdk/tests/display.c b/testsuite/gdk/display.c
index b4f64acfe3..b4f64acfe3 100644
--- a/gdk/tests/display.c
+++ b/testsuite/gdk/display.c
diff --git a/gdk/tests/display.test.in b/testsuite/gdk/display.test.in
index 9875c68ca3..9875c68ca3 100644
--- a/gdk/tests/display.test.in
+++ b/testsuite/gdk/display.test.in
diff --git a/gdk/tests/encoding.c b/testsuite/gdk/encoding.c
index 546bf29fae..546bf29fae 100644
--- a/gdk/tests/encoding.c
+++ b/testsuite/gdk/encoding.c
diff --git a/gdk/tests/encoding.test.in b/testsuite/gdk/encoding.test.in
index 06a329db68..06a329db68 100644
--- a/gdk/tests/encoding.test.in
+++ b/testsuite/gdk/encoding.test.in
diff --git a/gdk/tests/keysyms.c b/testsuite/gdk/keysyms.c
index 7d786f557c..7d786f557c 100644
--- a/gdk/tests/keysyms.c
+++ b/testsuite/gdk/keysyms.c
diff --git a/gdk/tests/keysyms.test.in b/testsuite/gdk/keysyms.test.in
index 2f1ce97583..2f1ce97583 100644
--- a/gdk/tests/keysyms.test.in
+++ b/testsuite/gdk/keysyms.test.in
diff --git a/gdk/tests/rgba.c b/testsuite/gdk/rgba.c
index fa2da629bf..fa2da629bf 100644
--- a/gdk/tests/rgba.c
+++ b/testsuite/gdk/rgba.c
diff --git a/gdk/tests/rgba.test.in b/testsuite/gdk/rgba.test.in
index 5fd3155fae..5fd3155fae 100644
--- a/gdk/tests/rgba.test.in
+++ b/testsuite/gdk/rgba.test.in