diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-07-16 18:50:35 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-07-16 18:50:35 +0000 |
| commit | 8ff7d1ad06759e3c2ffe40ce8afd0644a33adce2 (patch) | |
| tree | 722c4a088f7c988b1fb0c421502c2b89bd71a0ec /tests | |
| parent | cf48e6f8dcf9a942070e235105f9e203dc8440ae (diff) | |
fixed test.conf path
Originally committed as revision 2054 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rwxr-xr-x | tests/server-regression.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 576dd028ae..dd1db98825 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -17,7 +17,7 @@ LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref all: test libavtest test-server test-server: vsynth1/0.pgm asynth1.sw - @$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) + @$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) $(SRC_PATH)/tests/test.conf # fast regression tests for all codecs test mpeg4 mpeg: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr diff --git a/tests/server-regression.sh b/tests/server-regression.sh index 0e612716dd..9e05edb773 100755 --- a/tests/server-regression.sh +++ b/tests/server-regression.sh @@ -10,7 +10,7 @@ fi # Make sure that the data directory exists mkdir -p data -cp test.conf data/test.conf +cp "$2" data/test.conf perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf |