[gtk+] Move autotestkeywords to testsuite
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Move autotestkeywords to testsuite
- Date: Mon, 28 Mar 2016 21:57:15 +0000 (UTC)
commit 6f2d5a62909191052462ea4abe69f194ff140a2a
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Mar 28 17:56:13 2016 -0400
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(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 681807d..aeb51a6 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 5fc1cf1..a0aa944 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]