diff options
| author | Clément Bœsch <u@pkh.me> | 2017-05-03 12:51:48 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-05-03 16:49:12 +0200 |
| commit | 3f17751eeb7e3348576e2597884d5e5155aadcfb (patch) | |
| tree | 63d0f773c095f4293f6b35c317df964c6d0f69d5 /tests/fate.sh | |
| parent | c3e08544100cdd7045f710bfcea33e07d9fcd25b (diff) | |
| parent | 11a9320de54759340531177c9f2b1e31e6112cc2 (diff) | |
| download | ffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.zip ffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.tar.gz | |
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'tests/fate.sh')
| -rwxr-xr-x | tests/fate.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 6fa631e..3e106b7 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -85,7 +85,7 @@ clean(){ report(){ date=$(date -u +%Y%m%d%H%M%S) echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report - cat ${build}/config.fate >>report + cat ${build}/ffbuild/config.fate >>report cat ${build}/tests/data/fate/*.rep >>report 2>/dev/null || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv } @@ -108,7 +108,7 @@ test -d "$src" && update || checkout || die "Error fetching source" cd ${workdir} -version=$(${src}/version.sh ${src}) +version=$(${src}/ffbuild/version.sh ${src}) test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0 echo ${version} >version-$slot |
