[FFmpeg-cvslog] Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 11 19:02:04 2017 -0300| [85e2fe6281834ac7f16a12a332d9de4b2ec3cd29] | committer: James Almer

Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'

* commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e':
  fate: Add build-only targets to FATE

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85e2fe6281834ac7f16a12a332d9de4b2ec3cd29
---

 tests/Makefile       |  1 +
 tests/fate-run.sh    |  3 +++
 tests/fate/build.mak | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 278be24ccb..656c2c59c5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -113,6 +113,7 @@ include $(SRC_PATH)/tests/fate/apng.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
+include $(SRC_PATH)/tests/fate/build.mak
 include $(SRC_PATH)/tests/fate/canopus.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/checkasm.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 4641640d42..51480b46c7 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -350,6 +350,9 @@ concat(){
     else
         run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
     fi
+
+null(){
+    :
 }
 
 mkdir -p "$outdir"
diff --git a/tests/fate/build.mak b/tests/fate/build.mak
new file mode 100644
index 0000000000..f97f9ebe5c
--- /dev/null
+++ b/tests/fate/build.mak
@@ -0,0 +1,17 @@
+FATE_BUILD += fate-build-alltools
+fate-build-alltools: alltools
+
+FATE_BUILD += fate-build-checkheaders
+fate-build-checkheaders: checkheaders
+
+FATE_BUILD += fate-build-examples
+fate-build-examples: examples
+
+FATE_BUILD += fate-build-testprogs
+fate-build-testprogs: testprogs
+
+$(FATE_BUILD): CMD = null
+$(FATE_BUILD): CMP = null
+
+# FATE += $(FATE_BUILD)
+fate-build: $(FATE_BUILD)


======================================================================

diff --cc tests/fate-run.sh
index 4641640d42,8de749d4a7..51480b46c7
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@@ -284,72 -192,8 +284,75 @@@ pixfmts()
      test=$outertest
  }
  
 +gapless(){
 +    sample=$(target_path $1)
 +    extra_args=$2
 +
 +    decfile1="${outdir}/${test}.out-1"
 +    decfile2="${outdir}/${test}.out-2"
 +    decfile3="${outdir}/${test}.out-3"
 +    cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3"
 +
 +    # test packet data
 +    ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile1
 +    do_md5sum $decfile1
 +    # test decoded (and cut) data
 +    ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
 +    # the same as above again, with seeking to the start
 +    ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile2
 +    do_md5sum $decfile2
 +    ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
 +    # test packet data, with seeking to a specific position
 +    ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile3
 +    do_md5sum $decfile3
 +}
 +
 +gaplessenc(){
 +    sample=$(target_path $1)
 +    format=$2
 +    codec=$3
 +
 +    file1="${outdir}/${test}.out-1"
 +    cleanfiles="$cleanfiles $file1"
 +
 +    # test data after reencoding
 +    ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact -map 0:a -c:a $codec -f $format -y "$file1"
 +    probegaplessinfo "$file1"
 +}
 +
 +audio_match(){
 +    sample=$(target_path $1)
 +    trefile=$(target_path $2)
 +    extra_args=$3
 +
 +    decfile="${outdir}/${test}.wav"
 +    cleanfiles="$cleanfiles $decfile"
 +
 +    ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact $extra_args -y $decfile
 +    tests/audiomatch $decfile $trefile
 +}
 +
 +concat(){
 +    template=$1
 +    sample=$2
 +    mode=$3
 +    extra_args=$4
 +
 +    concatfile="${outdir}/${test}.ffconcat"
 +    packetfile="${outdir}/${test}.ffprobe"
 +    cleanfiles="$concatfile $packetfile"
 +
 +    awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
 +
 +    if [ "$mode" = "md5" ]; then
 +        run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile
 +        do_md5sum $packetfile
 +    else
 +        run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
 +    fi
++
+ null(){
+     :
  }
  
  mkdir -p "$outdir"
diff --cc tests/fate/build.mak
index 0000000000,ba9768e786..f97f9ebe5c
mode 000000,100644..100644
--- a/tests/fate/build.mak
+++ b/tests/fate/build.mak
@@@ -1,0 -1,17 +1,17 @@@
+ FATE_BUILD += fate-build-alltools
+ fate-build-alltools: alltools
+ 
+ FATE_BUILD += fate-build-checkheaders
+ fate-build-checkheaders: checkheaders
+ 
+ FATE_BUILD += fate-build-examples
+ fate-build-examples: examples
+ 
+ FATE_BUILD += fate-build-testprogs
+ fate-build-testprogs: testprogs
+ 
+ $(FATE_BUILD): CMD = null
+ $(FATE_BUILD): CMP = null
+ 
 -FATE += $(FATE_BUILD)
++# FATE += $(FATE_BUILD)
+ fate-build: $(FATE_BUILD)