From 0865bc02ea6a73a0b00b644ef1f213b90d53c722 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 8 Apr 2015 16:04:11 +0200 Subject: [PATCH] tests: Use AM_TESTS_ENVIRONMENT Needed by the new automake test runner --- common | 2 +- tests/check/Makefile.am | 2 +- tests/examples/manual/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common b/common index c8fb372b4c..d676993e50 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c8fb372b4c58158d6cb4e309650eb7bc369f882c +Subproject commit d676993e50eba12f40d8e176243041d4b91f7b13 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= \