Merge commit 'e22ffb3805f6994bd1fd7ab73e6297f36a53f915'

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

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

diff --cc tests/Makefile
index 0e809770ae0c058a10f850d9d1dbcf5acb49002b,8d9a42433f835e93d840a494425dd77214bc782a..ae658693db8a40923b9b76244c86574a9fa28ef4
--- 1/tests/Makefile
--- 2/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 aece90a01d30b2c2edc0010c2e1a85c6e60ac628,b9b3d9763e7edcf4352b71a1084c29f140b1dd8f..f1a1e34c367cf8770f77f48295947222d7678979
--- 1/tests/fate-run.sh
--- 2/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=$?

diff --cc tests/lavf-regression.sh
Simple merge

diff --cc tests/regression-funcs.sh
Simple merge