Remove unused argument to test scripts
authorMåns Rullgård <mans@mansr.com>
Tue, 2 Mar 2010 21:42:03 +0000 (21:42 +0000)
committerMåns Rullgård <mans@mansr.com>
Tue, 2 Mar 2010 21:42:03 +0000 (21:42 +0000)
Originally committed as revision 22156 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
tests/regression-funcs.sh

index 0dc6d4d..98c51c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -256,8 +256,8 @@ REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%)
 RESFILE = tests/data/$(2:regtest-%=%).$(1).regression
 
 define CODECTEST_CMD
 RESFILE = tests/data/$(2:regtest-%=%).$(1).regression
 
 define CODECTEST_CMD
-       $(SRC_PATH)/tests/codec-regression.sh $@ vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
-       $(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/codec-regression.sh $@ vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)"
 endef
 
 regtest-ref: regtest-aref regtest-vref
 endef
 
 regtest-ref: regtest-aref regtest-vref
@@ -266,7 +266,7 @@ regtest-vref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
        $(CODECTEST_CMD)
 
 regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw
        $(CODECTEST_CMD)
 
 regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw
-       @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 $(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
        @echo "TEST VCODEC $(@:regtest-%=%)"
 
 $(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
        @echo "TEST VCODEC $(@:regtest-%=%)"
@@ -276,17 +276,17 @@ $(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
 
 $(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
        @echo "TEST ACODEC $(@:regtest-%=%)"
 
 $(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
        @echo "TEST ACODEC $(@:regtest-%=%)"
-       @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,acodec,$@) $(call RESFILE,acodec,$@)
 
 $(LAVF_TESTS):
        @echo "TEST LAVF  $(@:regtest-%=%)"
        @diff -u -w $(call REFFILE,acodec,$@) $(call RESFILE,acodec,$@)
 
 $(LAVF_TESTS):
        @echo "TEST LAVF  $(@:regtest-%=%)"
-       @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@)
 
 $(LAVFI_TESTS):
        @echo "TEST LAVFI $(@:regtest-%=%)"
        @diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@)
 
 $(LAVFI_TESTS):
        @echo "TEST LAVFI $(@:regtest-%=%)"
-       @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@)
 
 seektest: codectest lavftest tests/seek_test$(EXESUF)
        @diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@)
 
 seektest: codectest lavftest tests/seek_test$(EXESUF)
index 7727d2a..7aa57e0 100755 (executable)
@@ -7,9 +7,8 @@
 test="${1#regtest-}"
 test_ref=$2
 raw_src_dir=$3
 test="${1#regtest-}"
 test_ref=$2
 raw_src_dir=$3
-outfile_prefix=$4
-target_exec=$5
-target_path=$6
+target_exec=$4
+target_path=$5
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"