Skip to content

Commit

Permalink
tests: Unify output directory creation
Browse files Browse the repository at this point in the history
  • Loading branch information
DonDiego committed Feb 16, 2019
1 parent 7e5bde9 commit e22ffb3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
5 changes: 3 additions & 2 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ THREADS = 1
VREF = tests/vsynth1/00.pgm
AREF = tests/data/asynth1.sw

OUTDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/pixfmt tests/vsynth1
OUTDIRS += $(FATE_OUTDIRS)

$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)./$< 'tests/vsynth1/'
Expand Down Expand Up @@ -149,7 +150,7 @@ $(addprefix fate-, $(IGNORE_TESTS)): REPORT=ignore

fate: $(FATE)

$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
$(FATE): $(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)'

Expand Down
2 changes: 0 additions & 2 deletions tests/fate-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ null(){
:
}

mkdir -p "$outdir"

exec 3>&2
eval $command >"$outfile" 2>$errfile
err=$?
Expand Down
1 change: 0 additions & 1 deletion tests/lavf-regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,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"
Expand Down
3 changes: 0 additions & 3 deletions tests/regression-funcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,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(){
Expand Down

0 comments on commit e22ffb3

Please sign in to comment.