diff -r 567bb019e3e3 -r 7e817e7e631c gstreamer_core/tsrc/check/gst/gstevent/src/gstevent.c --- a/gstreamer_core/tsrc/check/gst/gstevent/src/gstevent.c Tue Aug 31 15:30:33 2010 +0300 +++ b/gstreamer_core/tsrc/check/gst/gstevent/src/gstevent.c Wed Sep 01 12:16:41 2010 +0100 @@ -26,24 +26,14 @@ #include #include "std_log_result.h" #define LOG_FILENAME_LINE __FILE__, __LINE__ -#include void create_xml(int result) { - if(result) - { assert_failed = 1; - } - + testResultXml(xmlfile); close_log_file(); - - if(result) - { - exit (-1); - } - } @@ -53,14 +43,14 @@ static GET_GLOBAL_VAR_FROM_TLS(raised_critical,gstcheck,gboolean) #define _gst_check_raised_critical (*GET_GSTREAMER_WSD_VAR_NAME(raised_critical,gstcheck,g)()) #else -IMPORT_C extern gboolean _gst_check_raised_critical; +extern gboolean _gst_check_raised_critical; #endif #if EMULATOR static GET_GLOBAL_VAR_FROM_TLS(expecting_log,gstcheck,gboolean) #define _gst_check_expecting_log (*GET_GSTREAMER_WSD_VAR_NAME(expecting_log,gstcheck,g)()) #else -IMPORT_C extern gboolean _gst_check_expecting_log; +extern gboolean _gst_check_expecting_log; #endif void create_events() @@ -465,43 +455,43 @@ g_object_set (G_OBJECT (fakesink), "silent", TRUE, "sync", TRUE, NULL); /* add pad-probes to faksrc.src and fakesink.sink */ - fail_if ((srcpad = gst_element_get_static_pad (fakesrc, "src")) == NULL); + fail_if ((srcpad = gst_element_get_pad (fakesrc, "src")) == NULL); gst_pad_add_event_probe (srcpad, (GCallback) event_probe, GINT_TO_POINTER (TRUE)); - fail_if ((sinkpad = gst_element_get_static_pad (fakesink, "sink")) == NULL); + fail_if ((sinkpad = gst_element_get_pad (fakesink, "sink")) == NULL); gst_pad_add_event_probe (sinkpad, (GCallback) event_probe, GINT_TO_POINTER (FALSE)); /* Upstream events */ test_event (pipeline, GST_EVENT_CUSTOM_UPSTREAM, sinkpad, TRUE, srcpad); fail_unless (timediff (&got_event_time, - &sent_event_time) < G_USEC_PER_SEC, + &sent_event_time) < G_USEC_PER_SEC / 2, "GST_EVENT_CUSTOM_UP took too long to reach source: %" G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time)); test_event (pipeline, GST_EVENT_CUSTOM_BOTH, sinkpad, TRUE, srcpad); fail_unless (timediff (&got_event_time, - &sent_event_time) < G_USEC_PER_SEC, + &sent_event_time) < G_USEC_PER_SEC / 2, "GST_EVENT_CUSTOM_BOTH took too long to reach source: %" G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time)); test_event (pipeline, GST_EVENT_CUSTOM_BOTH_OOB, sinkpad, TRUE, srcpad); fail_unless (timediff (&got_event_time, - &sent_event_time) < G_USEC_PER_SEC , + &sent_event_time) < G_USEC_PER_SEC / 2, "GST_EVENT_CUSTOM_BOTH_OOB took too long to reach source: %" G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time)); /* Out of band downstream events */ test_event (pipeline, GST_EVENT_CUSTOM_DOWNSTREAM_OOB, srcpad, FALSE, srcpad); fail_unless (timediff (&got_event_time, - &sent_event_time) < G_USEC_PER_SEC , + &sent_event_time) < G_USEC_PER_SEC / 2, "GST_EVENT_CUSTOM_DS_OOB took too long to reach source: %" G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time)); test_event (pipeline, GST_EVENT_CUSTOM_BOTH_OOB, srcpad, FALSE, srcpad); fail_unless (timediff (&got_event_time, - &sent_event_time) < G_USEC_PER_SEC, + &sent_event_time) < G_USEC_PER_SEC / 2, "GST_EVENT_CUSTOM_BOTH_OOB took too long to reach source: %" G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time));