move scenarios to data/scenarios

Differential Revision: http://phabricator.freedesktop.org/D115

validate/configure.ac

@@ -289,6 +289,7 @@ Makefile
 common/Makefile
 common/m4/Makefile
 data/Makefile
+data/scenarios/Makefile
 gst/Makefile
 gst/validate/Makefile
 gst/preload/Makefile

validate/data/Makefile.am

@@ -1,52 +1 @@
-scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/scenarios
+SUBDIRS = scenarios
-scenarios_DATA = simple_seeks.scenario \
-                 seek_forward.scenario \
-                 seek_backward.scenario \
-                 seek_forward_backward.scenario \
-                 reverse_playback.scenario \
-                 fast_forward.scenario \
-                 fast_backward.scenario \
-                 alternate_fast_backward_forward.scenario \
-                 pause_resume.scenario \
-                 scrub_forward_seeking.scenario \
-                 scrub_backward_seeking.scenario \
-                 scrub_forward_seeking_full.scenario \
-                 scrub_backward_seeking_full.scenario \
-                 adaptive_video_size.scenario \
-                 adaptive_video_framerate.scenario \
-                 adaptive_video_framerate_size.scenario\
-                 force_key_unit.scenario\
-                 seek_with_stop.scenario\
-                 switch_audio_track_while_paused.scenario\
-                 switch_subtitle_track.scenario\
-                 switch_subtitle_track_while_paused.scenario\
-                 disable_subtitle_track_while_paused.scenario\
-                 change_state_intensive.scenario\
-                 play_15s.scenario \
-                 switch_audio_track.scenario
-
-EXTRA_DIST = simple_seeks.scenario \
-             seek_forward.scenario \
-             seek_backward.scenario \
-             seek_forward_backward.scenario \
-             reverse_playback.scenario \
-             fast_forward.scenario \
-             fast_backward.scenario \
-             alternate_fast_backward_forward.scenario \
-             pause_resume.scenario \
-             scrub_forward_seeking.scenario \
-             scrub_backward_seeking.scenario \
-             scrub_forward_seeking_full.scenario \
-             scrub_backward_seeking_full.scenario \
-             adaptive_video_size.scenario \
-             adaptive_video_framerate.scenario \
-             adaptive_video_framerate_size.scenario\
-             force_key_unit.scenario\
-             seek_with_stop.scenario\
-             switch_audio_track_while_paused.scenario\
-             switch_subtitle_track.scenario\
-             switch_subtitle_track_while_paused.scenario\
-             disable_subtitle_track_while_paused.scenario\
-             play_15s.scenario \
-             change_state_intensive.scenario\
-             switch_audio_track.scenario

validate/data/scenarios/Makefile.am

@@ -0,0 +1,52 @@
+scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/scenarios
+scenarios_DATA = simple_seeks.scenario \
+                 seek_forward.scenario \
+                 seek_backward.scenario \
+                 seek_forward_backward.scenario \
+                 reverse_playback.scenario \
+                 fast_forward.scenario \
+                 fast_backward.scenario \
+                 alternate_fast_backward_forward.scenario \
+                 pause_resume.scenario \
+                 scrub_forward_seeking.scenario \
+                 scrub_backward_seeking.scenario \
+                 scrub_forward_seeking_full.scenario \
+                 scrub_backward_seeking_full.scenario \
+                 adaptive_video_size.scenario \
+                 adaptive_video_framerate.scenario \
+                 adaptive_video_framerate_size.scenario\
+                 force_key_unit.scenario\
+                 seek_with_stop.scenario\
+                 switch_audio_track_while_paused.scenario\
+                 switch_subtitle_track.scenario\
+                 switch_subtitle_track_while_paused.scenario\
+                 disable_subtitle_track_while_paused.scenario\
+                 change_state_intensive.scenario\
+                 play_15s.scenario \
+                 switch_audio_track.scenario
+
+EXTRA_DIST = simple_seeks.scenario \
+             seek_forward.scenario \
+             seek_backward.scenario \
+             seek_forward_backward.scenario \
+             reverse_playback.scenario \
+             fast_forward.scenario \
+             fast_backward.scenario \
+             alternate_fast_backward_forward.scenario \
+             pause_resume.scenario \
+             scrub_forward_seeking.scenario \
+             scrub_backward_seeking.scenario \
+             scrub_forward_seeking_full.scenario \
+             scrub_backward_seeking_full.scenario \
+             adaptive_video_size.scenario \
+             adaptive_video_framerate.scenario \
+             adaptive_video_framerate_size.scenario\
+             force_key_unit.scenario\
+             seek_with_stop.scenario\
+             switch_audio_track_while_paused.scenario\
+             switch_subtitle_track.scenario\
+             switch_subtitle_track_while_paused.scenario\
+             disable_subtitle_track_while_paused.scenario\
+             play_15s.scenario \
+             change_state_intensive.scenario\
+             switch_audio_track.scenario

validate/gst/validate/gst-validate-scenario.c

@@ -2091,7 +2091,7 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
     lfilename =
         g_strdup_printf ("%s" GST_VALIDATE_SCENARIO_SUFFIX, scenarios[i]);
 
-    tldir = g_build_filename ("data/", lfilename, NULL);
+    tldir = g_build_filename ("data", "scenarios", lfilename, NULL);
 
     if ((ret = _load_scenario_file (scenario, tldir, &is_config)))
       goto check_scenario;
@@ -2566,7 +2566,7 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
   }
 
   /* Hack to make it work uninstalled */
-  dir = g_file_new_for_path ("data/");
+  dir = g_file_new_for_path ("data/scenarios");
   _list_scenarios_in_dir (dir, kf);
   g_object_unref (dir);