diff options
| author | Thiago Santos <thiagoss@osg.samsung.com> | 2016-02-05 19:15:16 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2016-02-05 19:15:16 -0300 |
| commit | 681b2b8d81d9584ff8f45f48916a8601afd46580 (patch) | |
| tree | 2677dc8b7a01ed9dd3aa457498fef03c4a0944be /tests | |
| parent | af6dc7055e33011ff8557da15b4b97f511c3fe34 (diff) | |
tests: extend the AM_TESTS_ENVIRONMENT from check.mak
To get the CK_DEFAULT_TIMEOUT defined for all tests.
Also replaces a 120 timeout that was set.
https://bugzilla.gnome.org/show_bug.cgi?id=761472
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 1a51fc666..fd96c1556 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -6,8 +6,7 @@ TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files REGISTRY_ENVIRONMENT = \ GST_REGISTRY_1_0=$(CHECK_REGISTRY) -AM_TESTS_ENVIRONMENT = \ - CK_DEFAULT_TIMEOUT=120 \ +AM_TESTS_ENVIRONMENT += \ GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH_1_0= \ |