summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <edward@centricular.com>2015-04-08 16:04:11 +0200
committerEdward Hervey <bilboed@bilboed.com>2015-04-08 16:08:24 +0200
commit0865bc02ea6a73a0b00b644ef1f213b90d53c722 (patch)
tree8ea768b830c870df2b04bb941143db5151593c13
parenta754eb45b939d4931266f407e8aa0c951c8cf0c6 (diff)
tests: Use AM_TESTS_ENVIRONMENT
Needed by the new automake test runner
m---------common0
-rw-r--r--tests/check/Makefile.am2
-rw-r--r--tests/examples/manual/Makefile.am2
3 files changed, 2 insertions, 2 deletions
diff --git a/common b/common
-Subproject c8fb372b4c58158d6cb4e309650eb7bc369f882
+Subproject d676993e50eba12f40d8e176243041d4b91f7b1
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 5e7e5ab8b3..8eeba3f1df 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -7,7 +7,7 @@ GST_TOOLS_DIR = $(top_builddir)/tools
REGISTRY_ENVIRONMENT = \
GST_REGISTRY=$(CHECK_REGISTRY)
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SCANNER_1_0=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am
index c9d439c9dd..0e4da6b93b 100644
--- a/tests/examples/manual/Makefile.am
+++ b/tests/examples/manual/Makefile.am
@@ -12,7 +12,7 @@ CHECK_REGISTRY = $(top_builddir)/tests/examples/manual/test-registry.reg
REGISTRY_ENVIRONMENT = \
GST_REGISTRY=$(CHECK_REGISTRY)
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
GST_PLUGIN_SYSTEM_PATH= \