[FFmpeg-devel] [PATCH 1/4] fate: Fix dependencies for ffprobe tests with external samples

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Sun Apr 19 01:50:57 EEST 2020


Andreas Rheinhardt:
> Andreas Rheinhardt:
>> Up until now, they were appended to the FATE_EXTERN-$(CONFIG_FFMPEG)
>> variable and were therefore activated when ffmpeg was enabled regardless
>> of whether ffprobe was enabled.
>>
>> Also the same happened with FATE_SAMPLES_FASTSTART, although the
>> corresponding test (mov-faststart-4gb-overflow) only requires external
>> samples.
>>
>> Furthermore, remove the unused FATE_FULL variable (FATE_EXTERN_FFPROBE has
>> taken its place).
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
>> ---
>>  tests/Makefile | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/Makefile b/tests/Makefile
>> index e5f41008d4..477f5bef26 100644
>> --- a/tests/Makefile
>> +++ b/tests/Makefile
>> @@ -203,8 +203,9 @@ FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
>>  
>>  FATE_SAMPLES_AVCONV           += $(FATE_SAMPLES_AVCONV-yes)
>>  FATE_SAMPLES_FFMPEG           += $(FATE_SAMPLES_FFMPEG-yes)
>> -FATE_EXTERN-$(CONFIG_FFMPEG)  += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FASTSTART)
>> -FATE_EXTERN += $(FATE_EXTERN-yes)
>> +FATE_EXTERN-$(CONFIG_FFMPEG)  += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
>> +FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_SAMPLES_FFPROBE)
>> +FATE_EXTERN                   += $(FATE_EXTERN-yes) $(FATE_SAMPLES_FASTSTART)
>>  
>>  FATE += $(FATE-yes)
>>  
>> @@ -218,7 +219,6 @@ $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF)
>>  $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF)
>>  
>>  ifdef SAMPLES
>> -FATE += $(FATE_FULL) $(FATE_FULL-yes)
>>  FATE += $(FATE_EXTERN)
>>  fate-rsync:
>>  	rsync $(RSYNC_OPTIONS) rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
>>
> Will push this set tomorrow if there are no objections.
> 
> - Andreas
> 
Applied.

- Andreas


More information about the ffmpeg-devel mailing list