summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/check/Makefile.am3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37adb729..400a48e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2007-03-01 Jan Schmidt <thaytan@mad.scientist.com>
* tests/check/Makefile.am:
+ Disable aasink in the states test. I suspect this is the element that
+ is calling exit(1) when it can't proceed.
+
+2007-03-01 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * tests/check/Makefile.am:
Draw plugins in from the build tree sys/ dir, rather than picking
up the already installed versions.
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 03a94317..8702ccf4 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -8,7 +8,8 @@ REGISTRY_ENVIRONMENT = \
TESTS_ENVIRONMENT = \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SYSTEM_PATH= \
- GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
+ GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \
+ STATE_IGNORE_ELEMENTS=aasink
# ths core dumps of some machines have PIDs appended
CLEANFILES = core.* test-registry.xml