diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2010-06-10 13:31:20 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2010-06-10 13:31:20 +0200 |
| commit | 472ec3b12a93263cdd6b947e4ca5f5da68a2b67e (patch) | |
| tree | 58c72112682abb53ba1a50fd9f944e074c63e3b2 | |
| parent | d7de0683d16290103f4dd4ddf20a504c84ee42c5 (diff) | |
check: Move tests to a subdirectory
| -rw-r--r-- | tests/check/Makefile.am | 19 | ||||
| -rw-r--r-- | tests/check/gnl/common.h (renamed from tests/check/common.h) | 0 | ||||
| -rw-r--r-- | tests/check/gnl/complex.c (renamed from tests/check/complex.c) | 0 | ||||
| -rw-r--r-- | tests/check/gnl/gnlcomposition.c (renamed from tests/check/gnlcomposition.c) | 0 | ||||
| -rw-r--r-- | tests/check/gnl/gnloperation.c (renamed from tests/check/gnloperation.c) | 0 | ||||
| -rw-r--r-- | tests/check/gnl/gnlsource.c (renamed from tests/check/gnlsource.c) | 0 | ||||
| -rw-r--r-- | tests/check/gnl/simple.c (renamed from tests/check/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 index b8ce71d..b8ce71d 100644 --- a/tests/check/common.h +++ b/tests/check/gnl/common.h diff --git a/tests/check/complex.c b/tests/check/gnl/complex.c index ae9db2a..ae9db2a 100644 --- a/tests/check/complex.c +++ b/tests/check/gnl/complex.c diff --git a/tests/check/gnlcomposition.c b/tests/check/gnl/gnlcomposition.c index 8b7f7a0..8b7f7a0 100644 --- a/tests/check/gnlcomposition.c +++ b/tests/check/gnl/gnlcomposition.c diff --git a/tests/check/gnloperation.c b/tests/check/gnl/gnloperation.c index 53fd6e2..53fd6e2 100644 --- a/tests/check/gnloperation.c +++ b/tests/check/gnl/gnloperation.c diff --git a/tests/check/gnlsource.c b/tests/check/gnl/gnlsource.c index 3a38eb3..3a38eb3 100644 --- a/tests/check/gnlsource.c +++ b/tests/check/gnl/gnlsource.c diff --git a/tests/check/simple.c b/tests/check/gnl/simple.c index 1756345..1756345 100644 --- a/tests/check/simple.c +++ b/tests/check/gnl/simple.c |