summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2014-01-24 17:36:53 +0100
committerThibault Saunier <thibault.saunier@collabora.com>2014-02-19 14:32:47 +0100
commit2f44d15e0b58db0eeac972385c3b186f160b4b9e (patch)
tree1883d666fb58a6fb86370f010f3226a7ce91f53b
parent68cbc15f355c822bec2666d39b3f55e827fda5a0 (diff)
validate: Ignore EOS actions that can not be executed
-rw-r--r--validate/gst/validate/gst-validate-scenario.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c
index a3c0f55..8707b6f 100644
--- a/validate/gst/validate/gst-validate-scenario.c
+++ b/validate/gst/validate/gst-validate-scenario.c
@@ -721,19 +721,26 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
{
if (scenario->priv->actions) {
GList *tmp;
+ guint nb_actions = 0;
gchar *actions = g_strdup (""), *tmpconcat;
for (tmp = scenario->priv->actions; tmp; tmp = tmp->next) {
GstValidateAction *action = ((GstValidateAction *) tmp->data);
tmpconcat = actions;
+
+ if (g_strcmp0 (action->name, "eos"))
+ continue;
+
+ nb_actions++;
actions = g_strdup_printf ("%s\n%*s%s",
actions, 20, "", gst_structure_to_string (action->structure));
g_free (tmpconcat);
}
- GST_VALIDATE_REPORT (scenario, SCENARIO_NOT_ENDED,
- "The following action were not executed: %s", actions);
+ if (nb_actions > 0)
+ GST_VALIDATE_REPORT (scenario, SCENARIO_NOT_ENDED,
+ "%i actions were not executed: %s", nb_actions, actions);
g_free (actions);
}
}