Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove stray commented out line, fix individual regression test dependencies.

Browse Source 
Originally committed as revision 9259 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 18 years ago
parent b3e104366a
commit b13cdd333f
1 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Makefile

7
Makefile
Unescape View File

@ -236,7 +236,6 @@ TAGS:
# regression tests # regression tests
fulltest test: codectest libavtest seektest fulltest test: codectest libavtest seektest
#codectest libavtest seektest test-server: $(PROGS)
FFMPEG_REFFILE = $(SRC_PATH)/tests/ffmpeg.regression.ref FFMPEG_REFFILE = $(SRC_PATH)/tests/ffmpeg.regression.ref
FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
@ -244,19 +243,19 @@ LIBAV_REFFILE = $(SRC_PATH)/tests/libav.regression.ref
ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref
SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref
test-server: tests/vsynth1/00.pgm tests/asynth1.sw test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
@echo @echo
@echo "Unfortunately ffserver is broken and therefore its regression" @echo "Unfortunately ffserver is broken and therefore its regression"
@echo "test fails randomly. Treat the results accordingly." @echo "test fails randomly. Treat the results accordingly."
@echo @echo
$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
codectest mpeg4 mpeg ac3 snow snowll: tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw tests/tiny_psnr$(EXESUF) codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw tests/tiny_psnr$(EXESUF)
$(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE) tests/vsynth1 $(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE) tests/vsynth1
$(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2 $(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
ifeq ($(CONFIG_GPL),yes) ifeq ($(CONFIG_GPL),yes)
libavtest: tests/vsynth1/00.pgm tests/asynth1.sw libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1 $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
seektest: tests/seek_test$(EXESUF) seektest: tests/seek_test$(EXESUF)
$(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE) $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)

Write Preview
Loading…
Cancel
Save