diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-07-17 09:30:48 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-07-17 09:30:48 +0000 |
| commit | 2ece2e97738880f8582a01f9efb9cf30ee4747d3 (patch) | |
| tree | 1b284a88a28b5894e58086b5dbe0884421d6aeb1 /Makefile | |
| parent | ef2b64f04c7269fe59dab0491784e06ade7892ca (diff) | |
| download | ffmpeg-2ece2e97738880f8582a01f9efb9cf30ee4747d3.tar.gz | |
Move up swscale_error target so that regression tests error out immediately.
Originally committed as revision 14261 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -262,6 +262,15 @@ LAVF_REG = tests/data/lavf.regression ROTOZOOM_REG = tests/data/rotozoom.regression VSYNTH_REG = tests/data/vsynth.regression +ifeq ($(CONFIG_SWSCALE),yes) +servertest codectest $(CODEC_TESTS) libavtest: swscale_error +swscale_error: + @echo + @echo "This regression test is incompatible with --enable-swscale." + @echo + @exit 1 +endif + codectest: $(VSYNTH_REG) $(ROTOZOOM_REG) diff -u -w $(FFMPEG_REFFILE) $(VSYNTH_REG) diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG) @@ -301,15 +310,6 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw @echo $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf -ifeq ($(CONFIG_SWSCALE),yes) -servertest codectest $(CODEC_TESTS) libavtest: swscale_error -swscale_error: - @echo - @echo "This regression test is incompatible with --enable-swscale." - @echo - @exit 1 -endif - tests/vsynth1/00.pgm: tests/videogen$(EXESUF) mkdir -p tests/vsynth1 $(BUILD_ROOT)/$< 'tests/vsynth1/' |