[grilo] core: Moved tests infrastructure to /tests



commit 50fc74eab57720b34451273c3f00c597cfe5c551
Author: Simón Pena <spenap gmail com>
Date:   Wed Sep 29 16:30:56 2010 +0200

    core: Moved tests infrastructure to /tests
    
    As discussed in the mailing list [1, 2, 3], this patch moves
    the test infrastructure from src/tests/ to tests/
    
    In these discussions there was an agreement about having a python/, js/
    etc directory for each language, under tests/. The test/ directory location
    wasn't agreed, but Edu Lima's reply on [4] seemed quite convincing, and
    nobody opposed to it.
    
    [1] http://mail.gnome.org/archives/grilo-list/2010-May/msg00041.html
    [2] http://mail.gnome.org/archives/grilo-list/2010-August/msg00074.html
    [3] http://mail.gnome.org/archives/grilo-list/2010-August/msg00107.html
    [4] http://mail.gnome.org/archives/grilo-list/2010-August/msg00106.html

 Makefile.am                      |    2 +-
 configure.ac                     |    2 +-
 src/Makefile.am                  |    2 --
 {src/tests => tests}/.gitignore  |    0
 {src/tests => tests}/Makefile.am |    2 ++
 {src/tests => tests}/registry.c  |    1 -
 6 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5cfd858..8ce9435 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src bindings tools
+SUBDIRS = src bindings tools tests
 
 if ENABLE_GTK_DOC
 SUBDIRS += doc
diff --git a/configure.ac b/configure.ac
index a5339fa..98273c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@ AC_CONFIG_FILES([
   grilo-uninstalled.pc
   grilo-0.1.pc
   src/Makefile
-  src/tests/Makefile
+  tests/Makefile
   tools/Makefile
   tools/grilo-test-ui/Makefile
   tools/grilo-inspect/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f4235d2..a2677b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,6 @@
 
 INCLUDES = -DGRL_PLUGINS_CONF_DIR=\""$(GRL_PLUGINS_CONF_DIR)"\"
 
-SUBDIRS = . tests
-
 lib_LTLIBRARIES = lib GRL_NAME@.la
 
 lib GRL_NAME@_la_CFLAGS =	\
diff --git a/src/tests/.gitignore b/tests/.gitignore
similarity index 100%
rename from src/tests/.gitignore
rename to tests/.gitignore
diff --git a/src/tests/Makefile.am b/tests/Makefile.am
similarity index 98%
rename from src/tests/Makefile.am
rename to tests/Makefile.am
index 44e2f1e..95c24a9 100644
--- a/src/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -61,3 +61,5 @@ test-report perf-report full-report:	${TEST_PROGS}
 # run make test as part of make check
 check-local: test
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
diff --git a/src/tests/registry.c b/tests/registry.c
similarity index 99%
rename from src/tests/registry.c
rename to tests/registry.c
index 0306cde..08e95e8 100644
--- a/src/tests/registry.c
+++ b/tests/registry.c
@@ -147,4 +147,3 @@ main (int argc, char **argv)
 
   return g_test_run ();
 }
-



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