mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 03:45:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

scenario: prioritize SCENARIOS_PATH when including

Browse source
This commit is contained in:
Mathieu Duponchelle 2019-02-01 23:08:16 +01:00
parent 71d2e3f418
commit f9190236af
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
validate/gst/validate/gst-validate-scenario.c
View file

@ -2988,10 +2988,8 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
if (relative_scenario) {
gchar *relative_dir = g_path_get_dirname (relative_scenario);
gchar *tmp_scenarios_path =
g_strdup_printf ("%s%c%s", relative_dir, G_SEARCHPATH_SEPARATOR,
scenarios_path);
GST_ERROR ("Checking %s", relative_dir);
g_strdup_printf ("%s%c%s", scenarios_path, G_SEARCHPATH_SEPARATOR,
relative_dir);
g_free (scenarios_path);
scenarios_path = tmp_scenarios_path;
@ -3025,13 +3023,6 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
lfilename =
g_strdup_printf ("%s" GST_VALIDATE_SCENARIO_SUFFIX, scenarios[i]);
tldir = g_build_filename ("data", "scenarios", lfilename, NULL);
if ((ret = _load_scenario_file (scenario, tldir, &is_config)))
goto check_scenario;
g_free (tldir);
if (env_scenariodir) {
guint i;
@ -3043,6 +3034,13 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
}
}
tldir = g_build_filename ("data", "scenarios", lfilename, NULL);
if ((ret = _load_scenario_file (scenario, tldir, &is_config)))
goto check_scenario;
g_free (tldir);
/* Try from local profiles */
tldir =
g_build_filename (g_get_user_data_dir (),