Browse code

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

Originally committed as revision 14261 to svn://svn.ffmpeg.org/ffmpeg/trunk

Diego Biurrun authored on 2008/07/17 18:30:48
Showing 1 changed files
... ...
@@ -262,6 +262,15 @@ LAVF_REG     = tests/data/lavf.regression
262 262
 ROTOZOOM_REG = tests/data/rotozoom.regression
263 263
 VSYNTH_REG   = tests/data/vsynth.regression
264 264
 
265
+ifeq ($(CONFIG_SWSCALE),yes)
266
+servertest codectest $(CODEC_TESTS) libavtest: swscale_error
267
+swscale_error:
268
+	@echo
269
+	@echo "This regression test is incompatible with --enable-swscale."
270
+	@echo
271
+	@exit 1
272
+endif
273
+
265 274
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
266 275
 	diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
267 276
 	diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
... ...
@@ -301,15 +310,6 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
301 301
 	@echo
302 302
 	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
303 303
 
304
-ifeq ($(CONFIG_SWSCALE),yes)
305
-servertest codectest $(CODEC_TESTS) libavtest: swscale_error
306
-swscale_error:
307
-	@echo
308
-	@echo "This regression test is incompatible with --enable-swscale."
309
-	@echo
310
-	@exit 1
311
-endif
312
-
313 304
 tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
314 305
 	mkdir -p tests/vsynth1
315 306
 	$(BUILD_ROOT)/$< 'tests/vsynth1/'