summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/check/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c061110..131090dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-02 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * tests/check/Makefile.am:
+ Disable cacasink from the states check too - it also calls exit(1)
+ on us when it can't find a terminal to talk to.
+
2007-03-02 Wim Taymans <wim@fluendo.com>
Patch by: Thijs Vermeir <thijsvermeir at gmail dot com>
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 8702ccf4..0eb63452 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -9,7 +9,7 @@ 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) \
- STATE_IGNORE_ELEMENTS=aasink
+ STATE_IGNORE_ELEMENTS="aasink cacasink"
# ths core dumps of some machines have PIDs appended
CLEANFILES = core.* test-registry.xml