diff mbox

[FFmpeg-devel] tests: don't include TARGET_PATH in the sample path needlessly

Message ID 20190403221743.2332-1-h.leppkes@gmail.com
State Accepted
Commit a87774636b870ee1888bec24327062baf4841ea0
Headers show

Commit Message

Hendrik Leppkes April 3, 2019, 10:17 p.m. UTC
The transcode() helper function will already prepend the TARGET_PATH to
the sample path, if its a relative path. This avoids an issue on
Windows, where the relative path check could fail.
---
 tests/fate/ffmpeg.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Almer April 4, 2019, 10:06 p.m. UTC | #1
On 4/3/2019 7:17 PM, Hendrik Leppkes wrote:
> The transcode() helper function will already prepend the TARGET_PATH to
> the sample path, if its a relative path. This avoids an issue on
> Windows, where the relative path check could fail.
> ---
>  tests/fate/ffmpeg.mak | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
> index af7282f9ab..71ab2f1f63 100644
> --- a/tests/fate/ffmpeg.mak
> +++ b/tests/fate/ffmpeg.mak
> @@ -95,7 +95,7 @@ fate-copy-trac2211-avi: CMD = transcode "h264 -r 14" $(TARGET_SAMPLES)/h264/bbc2
>  
>  FATE_STREAMCOPY-$(call ENCDEC, APNG, APNG) += fate-copy-apng
>  fate-copy-apng: fate-lavf-apng
> -fate-copy-apng: CMD = transcode apng "$(TARGET_PATH)/tests/data/lavf/lavf.apng" apng "-c:v copy"
> +fate-copy-apng: CMD = transcode apng tests/data/lavf/lavf.apng apng "-c:v copy"

Should be ok, thanks.

>  
>  FATE_STREAMCOPY-$(call DEMMUX, OGG, OGG) += fate-limited_input_seek fate-limited_input_seek-copyts
>  fate-limited_input_seek: $(TARGET_SAMPLES)/vorbis/moog_small.ogg
>
Hendrik Leppkes April 19, 2019, 2:33 p.m. UTC | #2
On Fri, Apr 5, 2019 at 12:06 AM James Almer <jamrial@gmail.com> wrote:
>
> On 4/3/2019 7:17 PM, Hendrik Leppkes wrote:
> > The transcode() helper function will already prepend the TARGET_PATH to
> > the sample path, if its a relative path. This avoids an issue on
> > Windows, where the relative path check could fail.
> > ---
> >  tests/fate/ffmpeg.mak | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
> > index af7282f9ab..71ab2f1f63 100644
> > --- a/tests/fate/ffmpeg.mak
> > +++ b/tests/fate/ffmpeg.mak
> > @@ -95,7 +95,7 @@ fate-copy-trac2211-avi: CMD = transcode "h264 -r 14" $(TARGET_SAMPLES)/h264/bbc2
> >
> >  FATE_STREAMCOPY-$(call ENCDEC, APNG, APNG) += fate-copy-apng
> >  fate-copy-apng: fate-lavf-apng
> > -fate-copy-apng: CMD = transcode apng "$(TARGET_PATH)/tests/data/lavf/lavf.apng" apng "-c:v copy"
> > +fate-copy-apng: CMD = transcode apng tests/data/lavf/lavf.apng apng "-c:v copy"
>
> Should be ok, thanks.
>

Applied.

- Hendrik
diff mbox

Patch

diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index af7282f9ab..71ab2f1f63 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -95,7 +95,7 @@  fate-copy-trac2211-avi: CMD = transcode "h264 -r 14" $(TARGET_SAMPLES)/h264/bbc2
 
 FATE_STREAMCOPY-$(call ENCDEC, APNG, APNG) += fate-copy-apng
 fate-copy-apng: fate-lavf-apng
-fate-copy-apng: CMD = transcode apng "$(TARGET_PATH)/tests/data/lavf/lavf.apng" apng "-c:v copy"
+fate-copy-apng: CMD = transcode apng tests/data/lavf/lavf.apng apng "-c:v copy"
 
 FATE_STREAMCOPY-$(call DEMMUX, OGG, OGG) += fate-limited_input_seek fate-limited_input_seek-copyts
 fate-limited_input_seek: $(TARGET_SAMPLES)/vorbis/moog_small.ogg