mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-31 12:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Set return value of apps to -1 only if a critical issues was reported

Browse source 
Conflicts:

	gst/validate/gst-validate-transcoding.c
	gst/validate/gst-validate.c
This commit is contained in:
Thibault Saunier 2013-08-19 14:13:10 -04:00 committed by Thiago Santos
parent 375a47aa0d
commit 96ca875c56
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
validate/gst/validate/gst-validate-transcoding.c
View file

@ -19,6 +19,7 @@
#include "gst-validate-scenario.h"
static gint ret = 0;
static GMainLoop *mainloop;
static GstElement *pipeline;
static GstEncodingProfile *encoding_profile = NULL;
@ -67,8 +68,10 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data)
{
GError *err;
gchar *debug;
ret = -1;
gst_message_parse_error (message, &err, &debug);
g_print ("Error: %s\n", err->message);
g_print ("Error: %s %s\n", GST_OBJECT_NAME (GST_MESSAGE_SRC (message)),
err->message);
g_error_free (err);
g_free (debug);
g_main_loop_quit (loop);
@ -271,6 +274,7 @@ int
main (int argc, gchar ** argv)
{
guint i;
GSList *tmp;
GstBus *bus;
GstValidateRunner *runner;
GstValidateMonitor *monitor;
@ -281,7 +285,7 @@ main (int argc, gchar ** argv)
GError *err = NULL;
const gchar *scenario = NULL;
guint count = -1;
guint count = 0;
gboolean want_help = FALSE;
gboolean list_scenarios = FALSE;
@ -391,7 +395,15 @@ main (int argc, gchar ** argv)
goto exit;
g_main_loop_run (mainloop);
count = gst_validate_runner_get_reports_count (runner);
for (tmp = gst_validate_runner_get_reports (runner); tmp; tmp = tmp->next) {
if (ret == 0 && ((GstValidateReport *) (tmp->data))->level ==
GST_VALIDATE_REPORT_LEVEL_CRITICAL) {
g_printerr ("Got critical error %s, setting return value to -1\n",
((GstValidateReport *) (tmp->data))->message);
ret = -1;
}
count++;
}
g_print ("Pipeline finished, total issues found: %u\n", count);
if (count) {
GSList *iter;
@ -413,7 +425,6 @@ exit:
#ifdef G_OS_UNIX
g_source_remove (signal_watch_id);
#endif
if (count)
return -1;
return 0;
return ret;
}

25
validate/gst/validate/gst-validate.c
View file

@ -17,6 +17,7 @@
#include <glib-unix.h>
#endif
static gint ret = 0;
static GMainLoop *mainloop;
static GstElement *pipeline;
@ -43,6 +44,7 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data)
{
GError *err;
gchar *debug;
ret = -1;
gst_message_parse_error (message, &err, &debug);
g_print ("Error: %s\n", err->message);
g_error_free (err);
@ -63,13 +65,14 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data)
int
main (int argc, gchar ** argv)
{
GSList *tmp;
GError *err = NULL;
const gchar *scenario = NULL;
gboolean list_scenarios = FALSE;
guint count = -1;
#ifdef G_OS_UNIX
guint signal_watch_id;
#endif
guint count = 0;
GOptionEntry options[] = {
{"set-scenario", '\0', 0, G_OPTION_ARG_STRING, &scenario,
@ -153,17 +156,18 @@ main (int argc, gchar ** argv)
g_print ("Pipeline started\n");
g_main_loop_run (mainloop);
count = gst_validate_runner_get_reports_count (runner);
g_print ("Pipeline finished, issues found: %u\n", count);
if (count) {
GSList *iter;
GSList *issues = gst_validate_runner_get_reports (runner);
for (tmp = gst_validate_runner_get_reports (runner); tmp; tmp = tmp->next) {
GstValidateReport *report = tmp->data;
for (iter = issues; iter; iter = g_slist_next (iter)) {
GstValidateReport *report = iter->data;
gst_validate_report_printf (report);
if (ret == 0 && report->level == GST_VALIDATE_REPORT_LEVEL_CRITICAL) {
g_printerr ("Got critical error %s, setting return value to -1\n",
((GstValidateReport *) (tmp->data))->message);
ret = -1;
}
count++;
}
g_print ("Pipeline finished, issues found: %u\n", count);
exit:
gst_element_set_state (pipeline, GST_STATE_NULL);
@ -174,7 +178,6 @@ exit:
#ifdef G_OS_UNIX
g_source_remove (signal_watch_id);
#endif
if (count)
return -1;
return 0;
return ret;
}