From 6f2d5a62909191052462ea4abe69f194ff140a2a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 28 Mar 2016 17:56:13 -0400
Subject: [PATCH] Move autotestkeywords to testsuite

All the 'make check' and installed tests are now in testsuite/,
and tests/ is just a collection manual test programs.
---
 tests/Makefile.am                            | 21 --------------------
 testsuite/gtk/Makefile.am                    | 15 ++++++++++++++
 {tests => testsuite/gtk}/autotestkeywords.cc |  0
 3 files changed, 15 insertions(+), 21 deletions(-)
 rename {tests => testsuite/gtk}/autotestkeywords.cc (100%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 681807d71c..aeb51a6ca4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -178,22 +178,6 @@ if USE_X11
 noinst_PROGRAMS += testerrors
 endif
 
-if HAVE_CXX
-
-AM_CXXFLAGS = $(AM_CPPFLAGS)
-
-noinst_PROGRAMS += autotestkeywords
-TESTS = autotestkeywords
-
-autotestkeywords_SOURCES = autotestkeywords.cc
-autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
-
-if HAVE_OBJC
-autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
-endif
-
-endif
-
 animated_resizing_DEPENDENCIES = $(TEST_DEPS)
 animated_revealing_DEPENDENCIES = $(TEST_DEPS)
 flicker_DEPENDENCIES = $(TEST_DEPS)
@@ -582,9 +566,4 @@ EXTRA_DIST += 			\
 	popover.ui		\
 	selectionmode.ui
 
-CLEANFILES = 			\
-	autotestkeywords.log	\
-	autotestkeywords.trs	\
-	test-suite.log
-
 -include $(top_srcdir)/git.mk
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 5fc1cf167d..a0aa944292 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -80,6 +80,21 @@ if OS_UNIX
 #TEST_PROGS			+= defaultvalue
 endif
 
+if HAVE_CXX
+
+AM_CXXFLAGS = $(AM_CPPFLAGS)
+
+TEST_PROGS += autotestkeywords
+
+autotestkeywords_SOURCES = autotestkeywords.cc
+autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
+
+if HAVE_OBJC
+autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
+endif
+
+endif
+
 treemodel_SOURCES = 		\
 	treemodel.h 		\
 	treemodel.c 		\
diff --git a/tests/autotestkeywords.cc b/testsuite/gtk/autotestkeywords.cc
similarity index 100%
rename from tests/autotestkeywords.cc
rename to testsuite/gtk/autotestkeywords.cc