diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:32:03 +0200 |
| commit | 6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a (patch) | |
| tree | 892dbfcfc54c4acdfe9619fdb597eb741c6abae6 /tests/fate.sh | |
| parent | 840238b8706ea2ca740cf4b49bffd8ae196352f9 (diff) | |
| parent | a1d0dcc7134f1401c682b5e13d4ab3864da21efb (diff) | |
| download | ffmpeg-6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: make executable again
LATM/AAC: Free previously initialized context on reinit.
configure: Do not unconditionally add -Wall to host CFLAGS.
configure: Set OS/2 objformat to a.out.
Add support for a.out object format to assembler macros.
fate: disable threading for encoding
fate: add comment field
fate: allow overriding default build and install dirs
mpegtsenc: Add an AVClass pointer to the private data
mpegaudio: clean up #includes
mpegaudio: move all header parsing to mpegaudiodecheader.[ch]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate.sh')
| -rwxr-xr-x | tests/fate.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 6f0e0fffcb..9fd117c3bc 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -75,7 +75,7 @@ clean(){ report(){ date=$(date -u +%Y%m%d%H%M%S) - echo "fate:0:${date}:${slot}:${version}:$1:$2" >report + echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv } @@ -91,8 +91,8 @@ lock ${workdir} || die "${workdir} locked" cd ${workdir} || die "cd ${workdir} failed" src=${workdir}/src -build=${workdir}/build -inst=${workdir}/install +: ${build:=${workdir}/build} +: ${inst:=${workdir}/install} test -d "$src" && update || checkout || die "Error fetching source" |