summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-05-27 00:26:43 +0000
committerDiego Biurrun <diego@biurrun.de>2008-05-27 00:26:43 +0000
commit60598b2f9a6bc80eb40cfc141792697bb0980956 (patch)
treebdc7ac03f70766bfcf7a53cd088875bbd381bcf1 /Makefile
parenta077f3bc1a9f4179c62ce09deb47abdd16d3c163 (diff)
Rename test-server target to servertest for consistency with other test targets.
Originally committed as revision 13449 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index eb40ff329b..46a005598f 100644
--- a/Makefile
+++ b/Makefile
@@ -307,7 +307,7 @@ $(LAVF_TESTS):
seektest: codectest libavtest tests/seek_test$(EXESUF)
$(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 "Unfortunately ffserver is broken and therefore its regression"
@echo "test fails randomly. Treat the results accordingly."
@@ -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
ifeq ($(CONFIG_SWSCALE),yes)
-test-server codectest $(CODEC_TESTS) libavtest: swscale_error
+servertest codectest $(CODEC_TESTS) libavtest: swscale_error
swscale_error:
@echo
@echo "This regression test is incompatible with --enable-swscale."
@@ -342,7 +342,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
.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
-include $(VHOOK_DEPS)