summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--docs/plugins/.gitignore3
-rw-r--r--tests/check/Makefile.am2
-rw-r--r--tests/check/elements/.gitignore1
4 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d61469d5..8755bd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-28 Jan Schmidt <jan.schmidt@sun.com>
+
+ * docs/plugins/.cvsignore:
+ * tests/check/elements/.cvsignore:
+ Ignore some more generated things
+
+ * tests/check/Makefile.am:
+ Ignore OSS elements in the state changes test too.
+
2008-05-28 Wim Taymans <wim.taymans@collabora.co.uk>
* docs/plugins/Makefile.am:
diff --git a/docs/plugins/.gitignore b/docs/plugins/.gitignore
index d3aa67f9..af6814d8 100644
--- a/docs/plugins/.gitignore
+++ b/docs/plugins/.gitignore
@@ -8,6 +8,8 @@ Makefile.in
*-unused.txt
*-overrides.txt
+gst-plugins-good-plugins.args.new
+gst-plugins-good-plugins.signals.new
tmpl
html
@@ -18,4 +20,3 @@ xml
gst-plugins-good-plugins-scan
gst-plugins-good-plugins-scan.c
inspect-registry.*
-
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 2081fca2..d5b52c0e 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -11,7 +11,7 @@ TESTS_ENVIRONMENT = \
GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \
GST_TEST_FILES_PATH=$(TEST_FILES_DIRECTORY) \
- STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfaudiosrc gconfvideosrc gconfaudiosink gconfvideosink halaudiosrc halaudiosink v4l2src"
+ STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfaudiosrc gconfvideosrc gconfaudiosink gconfvideosink halaudiosrc halaudiosink v4l2src osssrc osssink"
EXTRA_DIST = test-cert.pem test-key.pem
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 4f6c15f1..3695a1b1 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -23,6 +23,7 @@ level
matroskamux
multifile
rtp-payloading
+souphttpsrc
spectrum
sunaudio
videocrop