X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=c65bce8a99f40be2576c303c77b671fa88cb4654;hb=e4b8f1fa77e048eae8c6e3caee9ac495302a36aa;hp=a820d5f360cad380a08604cb202090da2452398d;hpb=9e6165b53eeef2932f2fd13a46c1b636719f7825;p=ffmpeg diff --git a/Makefile b/Makefile index a820d5f360c..c65bce8a99f 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,7 @@ CODEC_TESTS = $(addprefix regtest-, \ adpcm_swf \ flac \ wma \ + pcm \ ) LAVF_TESTS = $(addprefix regtest-, \ @@ -262,6 +263,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 +311,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/'