[gst-cvs] gnonlin: check: Move tests to a subdirectory

[Edward Hervey]

Module: gnonlin
Branch: master
Commit: 472ec3b12a93263cdd6b947e4ca5f5da68a2b67e
URL:    http://cgit.freedesktop.org/gstreamer/gnonlin/commit/?id=472ec3b12a93263cdd6b947e4ca5f5da68a2b67e

Author: Edward Hervey <bilboed at bilboed.com>
Date:   Thu Jun 10 13:31:20 2010 +0200

check: Move tests to a subdirectory

---

 tests/check/Makefile.am                |   19 ++++++++-----------
 tests/check/{ => gnl}/common.h         |    0 
 tests/check/{ => gnl}/complex.c        |    0 
 tests/check/{ => gnl}/gnlcomposition.c |    0 
 tests/check/{ => gnl}/gnloperation.c   |    0 
 tests/check/{ => gnl}/gnlsource.c      |    0 
 tests/check/{ => gnl}/simple.c         |    0 
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 1c7b7e9..9bb3c8c 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -6,7 +6,7 @@ REGISTRY_ENVIRONMENT = \
 	GST_REGISTRY=$(CHECK_REGISTRY)
 
 TESTS_ENVIRONMENT = \
-        CK_DEFAULT_TIMEOUT=60                                   \
+        CK_DEFAULT_TIMEOUT=120                                   \
 	$(REGISTRY_ENVIRONMENT)					\
 	GST_PLUGIN_SYSTEM_PATH=					\
 	GST_PLUGIN_PATH=$(top_builddir)/gnl:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR):$(GST_PLUGINS_DIR)
@@ -16,24 +16,21 @@ CLEANFILES = core.* test-registry.xml
 
 clean-local: clean-local-check
 
-$(CHECK_REGISTRY):
-	$(TESTS_ENVIRONMENT)
-
 TESTS = $(check_PROGRAMS)
 
 check_PROGRAMS =	\
-	./simple	\
-	./complex	\
-	./gnlsource	\
-	./gnloperation	\
-	./gnlcomposition
+	gnl/simple	\
+	gnl/complex	\
+	gnl/gnlsource	\
+	gnl/gnloperation	\
+	gnl/gnlcomposition
 
 noinst_HEADERS = \
-	common.h
+	gnl/common.h
 # these tests don't even pass
 noinst_PROGRAMS =
 
-AM_CFLAGS = -I./ $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
+AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp
diff --git a/tests/check/common.h b/tests/check/gnl/common.h
similarity index 100%
rename from tests/check/common.h
rename to tests/check/gnl/common.h
diff --git a/tests/check/complex.c b/tests/check/gnl/complex.c
similarity index 100%
rename from tests/check/complex.c
rename to tests/check/gnl/complex.c
diff --git a/tests/check/gnlcomposition.c b/tests/check/gnl/gnlcomposition.c
similarity index 100%
rename from tests/check/gnlcomposition.c
rename to tests/check/gnl/gnlcomposition.c
diff --git a/tests/check/gnloperation.c b/tests/check/gnl/gnloperation.c
similarity index 100%
rename from tests/check/gnloperation.c
rename to tests/check/gnl/gnloperation.c
diff --git a/tests/check/gnlsource.c b/tests/check/gnl/gnlsource.c
similarity index 100%
rename from tests/check/gnlsource.c
rename to tests/check/gnl/gnlsource.c
diff --git a/tests/check/simple.c b/tests/check/gnl/simple.c
similarity index 100%
rename from tests/check/simple.c
rename to tests/check/gnl/simple.c