[FFmpeg-cvslog] r14261 - trunk/Makefile

diego subversion
Thu Jul 17 11:30:49 CEST 2008


Author: diego
Date: Thu Jul 17 11:30:48 2008
New Revision: 14261

Log:
Move up swscale_error target so that regression tests error out immediately.


Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Jul 17 11:30:48 2008
@@ -262,6 +262,15 @@ LAVF_REG     = tests/data/lavf.regressio
 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/vsyn
 	@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/'




More information about the ffmpeg-cvslog mailing list