[PATCH 2/2] Try to fix cross-building for lavfitest and enable it.

[Stefano Sabatini]

---
 Makefile                              |    8 ++++----
 tests/lavfi-regression.sh             |    8 +++++---
 {tools => tests}/lavfi-showfiltfmts.c |    0
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename {tools => tests}/lavfi-showfiltfmts.c (100%)

diff --git a/Makefile b/Makefile
index 027b0ad..74de510 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
 OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
 TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
-HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr)
+HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr lavfi-showfiltfmts)
 
 BASENAMES   = ffmpeg ffplay ffprobe ffserver
 ALLPROGS    = $(addsuffix   $(EXESUF), $(BASENAMES))
@@ -146,7 +146,7 @@ testclean:
 	$(RM) -r tests/vsynth1 tests/vsynth2 tests/data
 	$(RM) $(addprefix tests/,$(CLEANSUFFIXES))
 	$(RM) tests/seek_test$(EXESUF) tests/seek_test.o
-	$(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
+	$(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr lavfi-showfiltfmts))
 
 clean:: testclean
 	$(RM) $(ALLPROGS) $(ALLPROGS_G)
@@ -261,7 +261,7 @@ LAVFI_TESTS =           \
     vflip               \
     vflip_crop          \
     vflip_vflip         \
-#   lavfi_pix_fmts      \
+    lavfi_pix_fmts      \
 
 ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
 VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
@@ -310,7 +310,7 @@ $(LAVF_TESTS):
 	@$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
 	@diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@)
 
-$(LAVFI_TESTS): tools/lavfi-showfiltfmts$(EXESUF)
+$(LAVFI_TESTS): tests/lavfi-showfiltfmts$(HOSTEXESUF)
 	@echo "TEST LAVFI $(@:regtest-%=%)"
 	@$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
 	@diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@)
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index ed2a968..b02f1c3 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -67,17 +67,19 @@ scale=200:100
 vflip
 "
 
+showfiltfmts="$target_exec ${target_path}/tests/lavfi-showfiltfmts"
+
 if [ -n "$do_lavfi_pix_fmts" ]; then
     # exclude pixel format currently not supported by NUT and which are not supported as input
     excluded_pix_fmts="rgb4_byte bgr4_byte rgb444le rgb444be bgr444le bgr444be"
-    excluded_pix_fmts="$excluded_pix_fmts $(ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)"
+    excluded_pix_fmts="$excluded_pix_fmts $($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)"
 
-    scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2)
+    scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2)
     scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts")
 
     for filter_args in $filters_args; do
         filter=$(echo $filter_args | sed -e 's/\([^=]\+\)=.*/\1/')
-        in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2)
+        in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2)
         pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts")
 
         for pix_fmt in $pix_fmts; do
diff --git a/tools/lavfi-showfiltfmts.c b/tests/lavfi-showfiltfmts.c
similarity index 100%
rename from tools/lavfi-showfiltfmts.c
rename to tests/lavfi-showfiltfmts.c
-- 
1.7.1


--PNTmBPCT7hxwcZjr--