diff -r 567bb019e3e3 -r 7e817e7e631c gstreamer_core/tsrc/check/libs/gstnetclientclock/src/gstnetclientclock.c --- a/gstreamer_core/tsrc/check/libs/gstnetclientclock/src/gstnetclientclock.c Tue Aug 31 15:30:33 2010 +0300 +++ b/gstreamer_core/tsrc/check/libs/gstnetclientclock/src/gstnetclientclock.c Wed Sep 01 12:16:41 2010 +0100 @@ -35,21 +35,21 @@ 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 //gboolean _gst_check_raised_warning = FALSE; #if EMULATOR static GET_GLOBAL_VAR_FROM_TLS(raised_warning,gstcheck,gboolean) #define _gst_check_raised_warning (*GET_GSTREAMER_WSD_VAR_NAME(raised_warning,gstcheck,g)()) #else -IMPORT_C extern gboolean _gst_check_raised_warning ; +extern gboolean _gst_check_raised_warning ; #endif //gboolean _gst_check_expecting_log = FALSE; #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 //gboolean _gst_check_expecting_log = FALSE; @@ -57,7 +57,7 @@ static GET_GLOBAL_VAR_FROM_TLS(threads_running,gstcheck,gboolean) #define _gst_check_threads_running (*GET_GSTREAMER_WSD_VAR_NAME(threads_running,gstcheck,g)()) #else -IMPORT_C extern gboolean _gst_check_threads_running ; +extern gboolean _gst_check_threads_running ; #endif @@ -65,7 +65,7 @@ GET_GLOBAL_VAR_FROM_TLS(buffers,gstcheck,GList*) #define buffers (*GET_GSTREAMER_WSD_VAR_NAME(buffers,gstcheck,g)()) #else -IMPORT_C extern GList *buffers; +extern GList *buffers; #endif @@ -73,7 +73,7 @@ GET_GLOBAL_VAR_FROM_TLS(thread_list,gstcheck,GList*) #define thread_list (*GET_GSTREAMER_WSD_VAR_NAME(thread_list,gstcheck,g)()) #else -IMPORT_C extern GList *thread_list; +extern GList *thread_list; #endif //GMutex *mutex; @@ -81,7 +81,7 @@ GET_GLOBAL_VAR_FROM_TLS(mutex,gstcheck,GMutex*) #define mutex (*GET_GSTREAMER_WSD_VAR_NAME(mutex,gstcheck,g)()) #else -IMPORT_C extern GMutex *mutex; +extern GMutex *mutex; #endif //GCond *start_cond; /* used to notify main thread of thread startups */ @@ -89,7 +89,7 @@ GET_GLOBAL_VAR_FROM_TLS(start_cond,gstcheck,GCond*) #define start_cond (*GET_GSTREAMER_WSD_VAR_NAME(start_cond,gstcheck,g)()) #else -IMPORT_C extern GCond *start_cond; +extern GCond *start_cond; #endif //GCond *sync_cond; /* used to synchronize all threads and main thread */ @@ -97,26 +97,17 @@ GET_GLOBAL_VAR_FROM_TLS(sync_cond,gstcheck,GCond*) #define sync_cond (*GET_GSTREAMER_WSD_VAR_NAME(sync_cond,gstcheck,g)()) #else -IMPORT_C extern GCond *sync_cond; +extern GCond *sync_cond; #endif //char* xmlfile = "gstnetclientclock"; void create_xml(int result) { - if(result) - { assert_failed = 1; - } - + testResultXml(xmlfile); close_log_file(); - - if(result) - { - exit (-1); - } - } void test_instantiation() @@ -218,12 +209,12 @@ -//void -//gst_net_client_clock_suite (void) -//{ -//test_instantiation(); -//test_functioning(); -//} +void +gst_net_client_clock_suite (void) +{ +test_instantiation(); +test_functioning(); +} void (*fn[]) (void) = { test_instantiation,