diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-04-17 22:32:16 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-04-17 22:32:16 +0000 |
| commit | 430bd1c7ec856a84fcf3b1145d51a41eb90fa983 (patch) | |
| tree | fed1548d593b84c4e40cfaea9b10435f01c68231 /tests | |
| parent | 3b3bd1687cd2e44de49f20b014292c4a4f0580b0 (diff) | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/check/elements/souphttpsrc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index e70edb82..2081fca2 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 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 be7aa728..34f8b93a 100644 --- 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) |