[FFmpeg-cvslog] Merge commit 'e22ffb3805f6994bd1fd7ab73e6297f36a53f915'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Mar 10 21:15:38 2019 -0300| [1c9ac700dd141e545538a824f5a8cb81bb0a375d] | committer: James Almer

Merge commit 'e22ffb3805f6994bd1fd7ab73e6297f36a53f915'

* commit 'e22ffb3805f6994bd1fd7ab73e6297f36a53f915':
  tests: Unify output directory creation

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

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

 tests/Makefile            | 5 +++--
 tests/fate-run.sh         | 2 --
 tests/lavf-regression.sh  | 1 -
 tests/regression-funcs.sh | 3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 0e809770ae..ae658693db 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -10,7 +10,8 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF)
 $(AREF): CMP=
 
 APITESTSDIR := tests/api
-OUTDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/
+FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR)
+OUTDIRS += $(FATE_OUTDIRS)
 
 $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
 	$(M)./$< 'tests/vsynth1/'
@@ -224,7 +225,7 @@ fate-hw: $(FATE_HW-yes)
 FATE += $(FATE_HW-yes)
 
 $(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
-$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
+$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
 	@echo "TEST    $(@:fate-%=%)"
 	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)'
 
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index aece90a01d..f1a1e34c36 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -377,8 +377,6 @@ null(){
     :
 }
 
-mkdir -p "$outdir"
-
 # Disable globbing: command arguments may contain globbing characters and
 # must be kept verbatim
 set -f
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 45c877e4ac..f3dc84d295 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -411,7 +411,6 @@ fi
 
 if [ -n "$do_pixfmt" ] ; then
 outfile="$datadir/pixfmt/"
-mkdir -p "$outfile"
 conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
              yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
              monob yuv440p yuvj440p"
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 0c7d34bea3..c88828c4a9 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -32,9 +32,6 @@ target_crcfile="$target_datadir/$this.crc"
 cleanfiles="$raw_dst $crcfile"
 trap 'rm -f -- $cleanfiles' EXIT
 
-mkdir -p "$datadir"
-mkdir -p "$outfile"
-
 [ "${V-0}" -gt 0 ] && echov=echov || echov=:
 
 echov(){


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

diff --cc tests/Makefile
index 0e809770ae,8d9a42433f..ae658693db
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -2,15 -2,8 +2,16 @@@ THREADS = 
  VREF = tests/vsynth1/00.pgm
  AREF = tests/data/asynth1.sw
  
 -FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/pixfmt tests/vsynth1
 +FATEW = 34
 +FATEH = 34
 +
 +FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF)
 +
 +$(AREF): CMP=
 +
 +APITESTSDIR := tests/api
- OUTDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/
++FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR)
+ OUTDIRS += $(FATE_OUTDIRS)
  
  $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
  	$(M)./$< 'tests/vsynth1/'
@@@ -217,16 -148,11 +218,16 @@@ TOOL = ffmpe
  
  $(addprefix fate-, $(IGNORE_TESTS)): REPORT=ignore
  
 -fate: $(FATE)
 +fate:: $(FATE)
 +
 +# Tests requiring hardware support are not included in a default fate run.
 +fate-hw: $(FATE_HW-yes)
 +FATE += $(FATE_HW-yes)
  
 -$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
 +$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
- $(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
++$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
  	@echo "TEST    $(@:fate-%=%)"
 -	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)'
 +	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)'
  
  fate-list:
  	@printf '%s\n' $(sort $(FATE))
diff --cc tests/fate-run.sh
index aece90a01d,b9b3d9763e..f1a1e34c36
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@@ -377,12 -196,6 +377,10 @@@ null()
      :
  }
  
- mkdir -p "$outdir"
- 
 +# Disable globbing: command arguments may contain globbing characters and
 +# must be kept verbatim
 +set -f
 +
  exec 3>&2
  eval $command >"$outfile" 2>$errfile
  err=$?