tests/check/Makefile.am: Disable some more elements in the state test.

Original commit message from CVS:
* tests/check/Makefile.am:
Disable some more elements in the state test.
Add a define so the soup test can find the test files
it needs at runtime.
* tests/check/elements/souphttpsrc.c: (run_server):
Add a define so the soup test can find the test files
it needs at runtime.

diff --git a/ChangeLog b/ChangeLog
index 4b263f1..1e9c9af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-16  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * tests/check/Makefile.am:
+       Disable some more elements in the state test.
+       Add a define so the soup test can find the test files
+       it needs at runtime.
+
+       * tests/check/elements/souphttpsrc.c: (run_server):
+
+       Add a define so the soup test can find the test files
+       it needs at runtime.
+
 2008-04-17  Jan Schmidt  <Jan.Schmidt@sun.com>
 
        * gst/goom/convolve_fx.c: (convolve_apply):

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index e70edb8..2081fca 100644 (file)
--- 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 v4l2src"
+       STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfaudiosrc gconfvideosrc gconfaudiosink gconfvideosink halaudiosrc halaudiosink v4l2src"
 
 EXTRA_DIST = test-cert.pem test-key.pem
 
@@ -129,7 +129,7 @@ elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 
 elements_alphacolor_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 
-elements_souphttpsrc_CFLAGS = $(SOUP_CFLAGS) $(AM_CFLAGS)
+elements_souphttpsrc_CFLAGS = -DCHECKDATA_DIR="$(srcdir)" $(SOUP_CFLAGS) $(AM_CFLAGS)
 elements_souphttpsrc_LDADD = $(SOUP_LIBS) $(LDADD)
 
 elements_sunaudio_CFLAGS = \

diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
index be7aa72..34f8b93 100644 (file)
--- a/tests/check/elements/souphttpsrc.c
+++ b/tests/check/elements/souphttpsrc.c
@@ -415,7 +415,8 @@ run_server (int *http_port, int *https_port)
   SoupServer *server, *ssl_server;
   int port = SOUP_ADDRESS_ANY_PORT;
   int ssl_port = SOUP_ADDRESS_ANY_PORT;
-  const char *ssl_cert_file = "test-cert.pem", *ssl_key_file = "test-key.pem";
+  const char *ssl_cert_file = G_STRINGIFY (CHECKDATA_DIR) "/test-cert.pem";
+  const char *ssl_key_file = G_STRINGIFY (CHECKDATA_DIR) "/test-key.pem";
   static int server_running = 0;
 
   if (server_running)