Commit 60598b2f authored by Diego Biurrun's avatar Diego Biurrun

Rename test-server target to servertest for consistency with other test targets.

Originally committed as revision 13449 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a077f3bc
...@@ -307,7 +307,7 @@ $(LAVF_TESTS): ...@@ -307,7 +307,7 @@ $(LAVF_TESTS):
seektest: codectest libavtest tests/seek_test$(EXESUF) seektest: codectest libavtest tests/seek_test$(EXESUF)
$(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE) $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw servertest: 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."
...@@ -315,7 +315,7 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw ...@@ -315,7 +315,7 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
$(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
ifeq ($(CONFIG_SWSCALE),yes) ifeq ($(CONFIG_SWSCALE),yes)
test-server codectest $(CODEC_TESTS) libavtest: swscale_error servertest codectest $(CODEC_TESTS) libavtest: swscale_error
swscale_error: swscale_error:
@echo @echo
@echo "This regression test is incompatible with --enable-swscale." @echo "This regression test is incompatible with --enable-swscale."
...@@ -342,7 +342,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS) ...@@ -342,7 +342,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
.PHONY: lib videohook documentation TAGS .PHONY: lib videohook documentation TAGS
.PHONY: codectest libavtest seektest test-server fulltest test .PHONY: codectest libavtest seektest servertest fulltest test
.PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error .PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error
-include $(VHOOK_DEPS) -include $(VHOOK_DEPS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment