tests: fix NULL pointer dereference, ternary operator silliness and message type use

diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c
index 8d3741d93a8498adfa11b63907dd05b979d3ef5e..7424f5482012c3b3570075017014b43fc4cc596a 100644 (file)
--- a/tests/check/ges/test-utils.c
+++ b/tests/check/ges/test-utils.c
@@ -153,19 +153,19 @@ ges_generate_test_file_audio_video (const gchar * filedest,
 
   while (!done) {
     message = gst_bus_poll (bus, GST_MESSAGE_ANY, GST_CLOCK_TIME_NONE);
-    if (GST_MESSAGE_TYPE (message) & GST_MESSAGE_EOS) {
+    if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_EOS) {
       done = TRUE;
       ret = TRUE;
-    } else if (GST_MESSAGE_TYPE (message) & GST_MESSAGE_ERROR) {
+    } else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) {
       gchar *debug = NULL;
       GError *err = NULL;
 
-      gst_message_parse_error (message, NULL, &debug);
+      gst_message_parse_error (message, &err, &debug);
       done = TRUE;
       ret = FALSE;
       GST_ERROR ("Got error %s from %s fron the bus while generation: %s"
           "debug infos: %s", GST_OBJECT_NAME (message->src), err->message,
-          debug ? debug : NULL, filedest);
+          debug ? debug : "none", filedest);
       g_clear_error (&err);
       g_free (debug);
     }