[libgames-support] Move tests to a subdirectory



commit 4ead1045b3e8f444a956bd28ebcc36fcc733b610
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Jun 28 11:30:39 2015 -0500

    Move tests to a subdirectory

 Makefile.am                              |    2 +-
 configure.ac                             |    1 +
 games/Makefile.am                        |   24 ------------------------
 po/POTFILES.in                           |    6 +++---
 po/POTFILES.skip                         |    6 +++---
 tests/Makefile.am                        |   26 ++++++++++++++++++++++++++
 {games/scores => tests}/test-scores.vala |    0
 7 files changed, 34 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7fda669..b6d7b76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = games po
+SUBDIRS = games po tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 
diff --git a/configure.ac b/configure.ac
index 2aaaf97..f4694ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ AC_CONFIG_FILES([
        libgames-support-1.0.pc
        po/Makefile.in
        games/Makefile
+       tests/Makefile
 ])
 
 AC_OUTPUT
diff --git a/games/Makefile.am b/games/Makefile.am
index 37a0a2c..2295f2d 100644
--- a/games/Makefile.am
+++ b/games/Makefile.am
@@ -37,30 +37,6 @@ dist_games_include_HEADERS = games-support.h
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = games-support.vapi
 
-noinst_PROGRAMS = test-scores
-
-TESTS = test-scores
-
-test_scores_SOURCES = \
-       games-support.vapi \
-       scores/test-scores.vala
-
-test_scores_CFLAGS = \
-       -w
-
-test_scores_CPPFLAGS = \
-       $(LIBGAMES_SUPPORT_CFLAGS)
-
-test_scores_LDADD = \
-       libgames-support.la \
-       $(LIBGAMES_SUPPORT_LIBS)
-
-test_scores_VALAFLAGS = \
-       --pkg gee-0.8 \
-       --pkg glib-2.0 \
-       --pkg gio-2.0 \
-       --pkg gtk+-3.0
-
 MAINTAINERCLEANFILES = \
        games-support.h         \
        games-support.vapi
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c34a91..86759ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
-scores/context.vala
-scores/dialog.vala
-scores/score.vala
+games/scores/context.vala
+games/scores/dialog.vala
+games/scores/score.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0e16c76..a4f9711 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,3 @@
-scores/context.c
-scores/dialog.c
-scores/score.c
+games/scores/context.c
+games/scores/dialog.c
+games/scores/score.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..389541e
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,26 @@
+noinst_PROGRAMS = test-scores
+
+TESTS = test-scores
+
+test_scores_SOURCES = \
+       $(top_builddir)/games/games-support.vapi        \
+       test-scores.vala
+
+test_scores_CFLAGS = \
+       -w
+
+test_scores_CPPFLAGS = \
+       -I$(top_srcdir)/games           \
+       $(LIBGAMES_SUPPORT_CFLAGS)
+
+test_scores_LDADD = \
+       $(top_builddir)/games/libgames-support.la       \
+       $(LIBGAMES_SUPPORT_LIBS)
+
+test_scores_VALAFLAGS = \
+       --pkg gee-0.8   \
+       --pkg glib-2.0  \
+       --pkg gio-2.0   \
+       --pkg gtk+-3.0
+
+-include $(top_srcdir)/git.mk
diff --git a/games/scores/test-scores.vala b/tests/test-scores.vala
similarity index 100%
rename from games/scores/test-scores.vala
rename to tests/test-scores.vala


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]