diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:21:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:33:27 +0100 |
commit | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (patch) | |
tree | a5e84b671607fe633568f86d2f5cf8c2dea698db /tests/fate-run.sh | |
parent | 211372e86dbf73505bd981dec7ad755e0623d22d (diff) | |
parent | e816034a5fa131b13c4ad87bb0b5065b4f5697c6 (diff) | |
download | ffmpeg-7711f19eda40a7fd1c8a327f1700ffdd115e1667.tar.gz |
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
fate-seek: remove use of gnu make 3.82 only private modifier
fate: move vsynth reference files to their own directory
fate: move fate-acodec reference files to their own dir
configure: avplay now depends on avresample
fate: split dependencies for fate-seek tests
Conflicts:
configure
tests/fate/seek.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-run.sh')
-rwxr-xr-x | tests/fate-run.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 84fadcb256..1945d88a23 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -164,21 +164,6 @@ lavfitest(){ regtest lavfi lavfi tests/vsynth1 } -seektest(){ - t="${test#seek-}" - ref=${base}/ref/seek/$t - case $t in - image_*) file="tests/data/images/${t#image_}/%02d.${t#image_}" ;; - *) file=$(echo $t | tr _ '?') - for d in fate/acodec- fate/vsynth2- lavf/; do - test -f tests/data/$d$file && break - done - file=$(echo tests/data/$d$file) - ;; - esac - run libavformat/seek-test $target_path/$file -} - mkdir -p "$outdir" exec 3>&2 |