[gitg/wip/release: 2/21] Move libgitg tests to tests/

[Jesse van den Kieboom <jessevdk src gnome org>]

commit cf2c2bdfbe752f9c08fb11b310158fb37a172d22
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Jan 3 19:10:02 2014 +0100

    Move libgitg tests to tests/

 configure.ac                                       |    2 +-
 libgitg/Makefile.am                                |    2 -
 {libgitg/tests => tests/libgitg}/Makefile.am       |   36 ++++++++++----------
 {libgitg/tests => tests/libgitg}/gitg-assert.h     |    0
 {libgitg/tests => tests/libgitg}/gitg-assert.vapi  |    0
 {libgitg/tests => tests/libgitg}/main.vala         |    0
 {libgitg/tests => tests/libgitg}/repository.vala   |    0
 {libgitg/tests => tests/libgitg}/test-commit.vala  |    0
 {libgitg/tests => tests/libgitg}/test-date.vala    |    0
 .../tests => tests/libgitg}/test-encoding.vala     |    0
 {libgitg/tests => tests/libgitg}/test-stage.vala   |    0
 {libgitg/tests => tests/libgitg}/test.vala         |    0
 12 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 829c1bb..ae4da1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,7 +286,6 @@ Makefile
 libgd/Makefile
 libgitg/Makefile
 libgitg/libgitg-1.0.pc
-libgitg/tests/Makefile
 libgitg-ext/Makefile
 libgitg-ext/libgitg-ext-1.0.pc
 gitg/Makefile
@@ -296,6 +295,7 @@ data/icons/Makefile
 data/org.gnome.gitg.gschema.xml.in
 po/Makefile.in
 tests/Makefile
+tests/libgitg/Makefile
 plugins/Makefile
 plugins/diff/Makefile
 plugins/diff/icons/Makefile
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index 8a767b7..37557e3 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = tests
-
 lib_LTLIBRARIES = libgitg-1.0.la
 
 AM_CPPFLAGS =                                                          \
diff --git a/libgitg/tests/Makefile.am b/tests/libgitg/Makefile.am
similarity index 72%
rename from libgitg/tests/Makefile.am
rename to tests/libgitg/Makefile.am
index 7ea6f01..b269531 100644
--- a/libgitg/tests/Makefile.am
+++ b/tests/libgitg/Makefile.am
@@ -1,8 +1,14 @@
-AM_CPPFLAGS = -g -I$(top_srcdir) -I$(top_srcdir)/gitg -I$(top_srcdir)/libgitg $(GITG_DEBUG_FLAGS) 
$(GITG_CFLAGS)
+TEST_PROGS = test-libgitg
 
+TESTS = $(TEST_PROGS)
 noinst_PROGRAMS = $(TEST_PROGS)
 
-AM_VALAFLAGS = \
+test_libgitg_CPPFLAGS =                        \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/gitg                    \
+       -I$(top_srcdir)/libgitg
+
+test_libgitg_VALAFLAGS =                       \
        --pkg posix --pkg gitg-assert           \
        --pkg Ggit-1.0                          \
        --pkg libgitg-1.0                       \
@@ -18,7 +24,16 @@ AM_VALAFLAGS = \
        --vapidir $(top_builddir)/libgitg       \
        --disable-warnings
 
-TEST_PROGS = test-libgitg
+test_libgitg_CFLAGS =                          \
+       $(GITG_DEBUG_FLAGS)                     \
+       $(GITG_CFLAGS)                          \
+       $(LIBGITG_CFLAGS)                       \
+       -g                                      \
+       -w
+
+test_libgitg_LDADD = \
+       $(top_builddir)/libgitg/libgitg-1.0.la  \
+       $(LIBGITG_LIBS)
 
 test_libgitg_SOURCES =                         \
        test.vala                               \
@@ -29,21 +44,6 @@ test_libgitg_SOURCES =                               \
        test-commit.vala                        \
        test-encoding.vala
 
-test_libgitg_CFLAGS = $(LIBGITG_CFLAGS) -w
-
-test_libgitg_LDADD = \
-       $(top_builddir)/libgitg/libgitg-1.0.la  \
-       $(LIBGITG_LIBS)
-
-TESTS = $(TEST_PROGS)
-
-BUILT_SOURCES =                                        \
-       test_libgitg_vala.stamp
-
-CLEANFILES =                                   \
-       $(test_libgitg_SOURCES:.vala=.c)        \
-       $(BUILT_SOURCES)
-
 EXTRA_DIST = gitg-assert.h gitg-assert.vapi
 
 -include $(top_srcdir)/git.mk
diff --git a/libgitg/tests/gitg-assert.h b/tests/libgitg/gitg-assert.h
similarity index 100%
rename from libgitg/tests/gitg-assert.h
rename to tests/libgitg/gitg-assert.h
diff --git a/libgitg/tests/gitg-assert.vapi b/tests/libgitg/gitg-assert.vapi
similarity index 100%
rename from libgitg/tests/gitg-assert.vapi
rename to tests/libgitg/gitg-assert.vapi
diff --git a/libgitg/tests/main.vala b/tests/libgitg/main.vala
similarity index 100%
rename from libgitg/tests/main.vala
rename to tests/libgitg/main.vala
diff --git a/libgitg/tests/repository.vala b/tests/libgitg/repository.vala
similarity index 100%
rename from libgitg/tests/repository.vala
rename to tests/libgitg/repository.vala
diff --git a/libgitg/tests/test-commit.vala b/tests/libgitg/test-commit.vala
similarity index 100%
rename from libgitg/tests/test-commit.vala
rename to tests/libgitg/test-commit.vala
diff --git a/libgitg/tests/test-date.vala b/tests/libgitg/test-date.vala
similarity index 100%
rename from libgitg/tests/test-date.vala
rename to tests/libgitg/test-date.vala
diff --git a/libgitg/tests/test-encoding.vala b/tests/libgitg/test-encoding.vala
similarity index 100%
rename from libgitg/tests/test-encoding.vala
rename to tests/libgitg/test-encoding.vala
diff --git a/libgitg/tests/test-stage.vala b/tests/libgitg/test-stage.vala
similarity index 100%
rename from libgitg/tests/test-stage.vala
rename to tests/libgitg/test-stage.vala
diff --git a/libgitg/tests/test.vala b/tests/libgitg/test.vala
similarity index 100%
rename from libgitg/tests/test.vala
rename to tests/libgitg/test.vala