From f9190236afd291c0169a6000e87e99a9410937eb Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Fri, 1 Feb 2019 23:08:16 +0100 Subject: [PATCH] scenario: prioritize SCENARIOS_PATH when including --- validate/gst/validate/gst-validate-scenario.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index 654cbe8..9723ff8 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -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 (), -- 2.7.4