diff options
Diffstat (limited to 'tests/check')
-rw-r--r-- | tests/check/Makefile.am | 8 | ||||
-rw-r--r-- | tests/check/audiotestsrc.flac | bin | 4708 -> 0 bytes | |||
-rw-r--r-- | tests/check/elements/id3demux.c | 6 | ||||
-rw-r--r-- | tests/check/elements/souphttpsrc.c | 4 | ||||
-rw-r--r-- | tests/check/pipelines/flacdec.c | 27 | ||||
-rw-r--r-- | tests/check/test-cert.pem | 22 | ||||
-rw-r--r-- | tests/check/test-key.pem | 15 |
7 files changed, 15 insertions, 67 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 88e8c16b..22d0a492 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -10,11 +10,8 @@ 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_TEST_FILES_PATH=$(TEST_FILES_DIRECTORY) \ STATE_IGNORE_ELEMENTS="aasink autoaudiosrc autoaudiosink autovideosrc autovideosink cacasink cairotextoverlay gconfaudiosrc gconfvideosrc gconfaudiosink gconfvideosink halaudiosrc halaudiosink v4l2src osssrc osssink pulsesink pulsesrc pulsemixer" -EXTRA_DIST = test-cert.pem test-key.pem audiotestsrc.flac - # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.* @@ -115,7 +112,8 @@ TESTS = $(check_PROGRAMS) noinst_PROGRAMS = \ elements/autodetect -AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_CFLAGS) +AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \ + $(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) # valgrind testing @@ -147,7 +145,7 @@ elements_deinterleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMIN elements_interleave_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) elements_interleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD) -elements_souphttpsrc_CFLAGS = -DCHECKDATA_DIR="$(srcdir)" $(SOUP_CFLAGS) $(AM_CFLAGS) +elements_souphttpsrc_CFLAGS = $(SOUP_CFLAGS) $(AM_CFLAGS) elements_souphttpsrc_LDADD = $(SOUP_LIBS) $(LDADD) elements_sunaudio_CFLAGS = \ diff --git a/tests/check/audiotestsrc.flac b/tests/check/audiotestsrc.flac Binary files differdeleted file mode 100644 index 2f12c3f7..00000000 --- a/tests/check/audiotestsrc.flac +++ /dev/null diff --git a/tests/check/elements/id3demux.c b/tests/check/elements/id3demux.c index a3eb77b4..ef1d4538 100644 --- a/tests/check/elements/id3demux.c +++ b/tests/check/elements/id3demux.c @@ -59,7 +59,6 @@ read_tags_from_file (const gchar * file, gboolean push_mode) GstMessage *msg; GstElement *src, *sep, *sink, *id3demux, *pipeline; GstBus *bus; - const gchar *dir; gchar *path; pipeline = gst_pipeline_new ("pipeline"); @@ -96,10 +95,7 @@ read_tags_from_file (const gchar * file, gboolean push_mode) /* can't link id3demux and sink yet, do that later */ g_signal_connect (id3demux, "pad-added", G_CALLBACK (pad_added_cb), pipeline); - dir = g_getenv ("GST_TEST_FILES_PATH"); - fail_unless (dir != NULL, "GST_TEST_FILES_PATH environment variable not set"); - - path = g_build_filename (dir, file, NULL); + path = g_build_filename (GST_TEST_FILES_PATH, file, NULL); GST_LOG ("reading file '%s'", path); g_object_set (src, "location", path, NULL); diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c index 01123699..3c6f5199 100644 --- a/tests/check/elements/souphttpsrc.c +++ b/tests/check/elements/souphttpsrc.c @@ -563,8 +563,8 @@ run_server (guint * http_port, guint * https_port) SoupServer *server, *ssl_server; guint port = SOUP_ADDRESS_ANY_PORT; guint ssl_port = SOUP_ADDRESS_ANY_PORT; - const char *ssl_cert_file = G_STRINGIFY (CHECKDATA_DIR) "/test-cert.pem"; - const char *ssl_key_file = G_STRINGIFY (CHECKDATA_DIR) "/test-key.pem"; + const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem"; + const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem"; static int server_running = 0; SoupAuthDomain *domain = NULL; diff --git a/tests/check/pipelines/flacdec.c b/tests/check/pipelines/flacdec.c index 31710255..ced6c343 100644 --- a/tests/check/pipelines/flacdec.c +++ b/tests/check/pipelines/flacdec.c @@ -18,6 +18,7 @@ */ #include <gst/check/gstcheck.h> +#include <glib/gstdio.h> static guint16 buffer_get_first_sample (GstBuffer * buf) @@ -60,6 +61,8 @@ GST_START_TEST (test_decode) guint16 first_sample = 0; guint size = 0; + fail_unless_equals_int (g_chdir (GST_TEST_FILES_PATH), 0); + pipeline = gst_parse_launch ("filesrc location=audiotestsrc.flac" " ! flacdec ! appsink name=sink", NULL); fail_unless (pipeline != NULL); @@ -105,6 +108,8 @@ GST_START_TEST (test_decode_seek_full) gboolean result; guint size = 0; + fail_unless_equals_int (g_chdir (GST_TEST_FILES_PATH), 0); + pipeline = gst_parse_launch ("filesrc location=audiotestsrc.flac" " ! flacdec ! appsink name=sink", NULL); fail_unless (pipeline != NULL); @@ -158,6 +163,8 @@ GST_START_TEST (test_decode_seek_partial) guint size = 0; guint16 first_sample = 0; + fail_unless_equals_int (g_chdir (GST_TEST_FILES_PATH), 0); + pipeline = gst_parse_launch ("filesrc location=audiotestsrc.flac" " ! flacdec ! appsink name=sink", NULL); fail_unless (pipeline != NULL); @@ -206,7 +213,7 @@ GST_START_TEST (test_decode_seek_partial) GST_END_TEST; -Suite * +static Suite * flacdec_suite (void) { Suite *s = suite_create ("flacdec"); @@ -224,20 +231,4 @@ flacdec_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = flacdec_suite (); - - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (flacdec); diff --git a/tests/check/test-cert.pem b/tests/check/test-cert.pem deleted file mode 100644 index a6b66083..00000000 --- a/tests/check/test-cert.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDjzCCAvigAwIBAgIBADANBgkqhkiG9w0BAQQFADCBkjELMAkGA1UEBhMCVVMx -FjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzANBgNVBAcTBkJvc3RvbjEPMA0GA1UE -ChMGWGltaWFuMRUwEwYDVQQLEwxTb3VwIEtpdGNoZW4xEjAQBgNVBAMTCWxvY2Fs -aG9zdDEeMBwGCSqGSIb3DQEJARYPc291cEB4aW1pYW4uY29tMB4XDTAzMDkyMzE4 -Mzc0MVoXDTEzMDkyMzE4Mzc0MVowgZIxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1N -YXNzYWNodXNldHRzMQ8wDQYDVQQHEwZCb3N0b24xDzANBgNVBAoTBlhpbWlhbjEV -MBMGA1UECxMMU291cCBLaXRjaGVuMRIwEAYDVQQDEwlsb2NhbGhvc3QxHjAcBgkq -hkiG9w0BCQEWD3NvdXBAeGltaWFuLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw -gYkCgYEAwzT/WxfdXqb2hbyjQav3FtN7tLxj3UbZKCKDYlizBsNLxb9exfebhV4h -CoAcaSNvLUnk3tAXnk+BDsIC1V4SbwqHYR17PnO3YZ8fkNwh5RGZwNx+zafdfFyu -+3Sh+mE03bljpDlTsgPL8CiFCd68MPRnuHoKt5iTpSyLC6Df0qcCAwEAAaOB8jCB -7zAdBgNVHQ4EFgQU9A9omrgBK5Kkl6FRxrgJU2voj4Uwgb8GA1UdIwSBtzCBtIAU -9A9omrgBK5Kkl6FRxrgJU2voj4WhgZikgZUwgZIxCzAJBgNVBAYTAlVTMRYwFAYD -VQQIEw1NYXNzYWNodXNldHRzMQ8wDQYDVQQHEwZCb3N0b24xDzANBgNVBAoTBlhp -bWlhbjEVMBMGA1UECxMMU291cCBLaXRjaGVuMRIwEAYDVQQDEwlsb2NhbGhvc3Qx -HjAcBgkqhkiG9w0BCQEWD3NvdXBAeGltaWFuLmNvbYIBADAMBgNVHRMEBTADAQH/ -MA0GCSqGSIb3DQEBBAUAA4GBAGCV56N7bEDNdE76T8i68gS00NIVVosVQjS39Ojd -ED+rvq0YYvuc2UXlzAonuCJfwFc73g4wSIjS0xijF5rnugZ+aay0LNv2y+Rf34CQ -RNswrwurFjlxgTOO+Wx2IM64mAnBfj43M8uKEZFqAiGKrZZ0xIqyUMlku0FgXDH2 -Jvpg ------END CERTIFICATE----- diff --git a/tests/check/test-key.pem b/tests/check/test-key.pem deleted file mode 100644 index 9bea9bf2..00000000 --- a/tests/check/test-key.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDDNP9bF91epvaFvKNBq/cW03u0vGPdRtkoIoNiWLMGw0vFv17F -95uFXiEKgBxpI28tSeTe0BeeT4EOwgLVXhJvCodhHXs+c7dhnx+Q3CHlEZnA3H7N -p918XK77dKH6YTTduWOkOVOyA8vwKIUJ3rww9Ge4egq3mJOlLIsLoN/SpwIDAQAB -AoGAOGAi6zzuKrrPcXo0L/ApEQeMr3rE4I/ogUXOaeWx9l8KkBafmU7UNGUl57Fu -AxM/tXWkypCQcaEGZau0Q8jCS5wKgynNi72F4OzBqgjgW4vvtrjfC1LagnCd2ZMX -V5XVECjO/sEDg0hJeOsXlKbECAgvHMU3dSCGO7DmuG9tIxkCQQDsth1VvVjOdfp6 -klOfYzbAM1p9HIcNPJMeuBFqq//UHX4aPqh/6G6W06TOTN+bjZBmitG9yjV958t2 -rPxl64f7AkEA0x0WOLm5S0LNsv7zwjXuTcj+NCHL36b3dK90oxX8Gq69PANL/EJY -ItpHNLgzzo4DRmQy8q0WZlC9HYk1YljERQJAEN7+AkFnlfeErb3GJgMNQO+oEGi7 -G29o0PSvkRnHNxgPB9HVcqBfWXKmOWnzOgQB+b0FK/DAlUOzFbdImf8KhwJAFLty -hzeV/tIcqUtoXNY3BOSMMkpvXxNikc75QVrTWzt10gLw32EUjreo7oB4dfx0TeFh -L3vYC0w6hkAHQhU9kQJAPSEQ+Bqzlk6BrQNrNFEVzi1Rwpz7LOzhOjuYW6bsiAdX -axA4r6Xh25x08ZU7cqX7gwVLHL6pgrEKuUs0Nc5Klg== ------END RSA PRIVATE KEY----- |