[FFmpeg-cvslog] r22156 - in trunk: Makefile tests/regression-funcs.sh
mru
subversion
Tue Mar 2 22:42:04 CET 2010
Author: mru
Date: Tue Mar 2 22:42:03 2010
New Revision: 22156
Log:
Remove unused argument to test scripts
Modified:
trunk/Makefile
trunk/tests/regression-funcs.sh
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Tue Mar 2 22:41:52 2010 (r22155)
+++ trunk/Makefile Tue Mar 2 22:42:03 2010 (r22156)
@@ -256,8 +256,8 @@ REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2
RESFILE = tests/data/$(2:regtest-%=%).$(1).regression
define CODECTEST_CMD
- $(SRC_PATH)/tests/codec-regression.sh $@ vsynth1 tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
- $(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 a "$(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
@@ -266,7 +266,7 @@ regtest-vref: ffmpeg$(EXESUF) tests/vsyn
$(CODECTEST_CMD)
regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw
- @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec a "$(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-%=%)"
@@ -276,17 +276,17 @@ $(VCODEC_TESTS): tests/tiny_psnr$(HOSTEX
$(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF)
@echo "TEST ACODEC $(@:regtest-%=%)"
- @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec a "$(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-%=%)"
- @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 b "$(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-%=%)"
- @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 b "$(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)
Modified: trunk/tests/regression-funcs.sh
==============================================================================
--- trunk/tests/regression-funcs.sh Tue Mar 2 22:41:52 2010 (r22155)
+++ trunk/tests/regression-funcs.sh Tue Mar 2 22:42:03 2010 (r22156)
@@ -7,9 +7,8 @@
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}"
More information about the ffmpeg-cvslog
mailing list