summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-10-02 16:55:06 +0000
committerDiego Biurrun <diego@biurrun.de>2006-10-02 16:55:06 +0000
commitd568d0feb4f2e40c8a6e338a4d1970f940b6ec66 (patch)
tree68343abdb3c1b5b79136cbffe41176a2d40e50e8 /tests
parentc86ecbb7ce3ffba97369a6764e020ee676fc3c36 (diff)
downloadffmpeg-streaming-d568d0feb4f2e40c8a6e338a4d1970f940b6ec66.zip
ffmpeg-streaming-d568d0feb4f2e40c8a6e338a4d1970f940b6ec66.tar.gz
Merge identical targets.
Originally committed as revision 6531 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 7cd916f..a5b34db 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,8 +14,7 @@ SERVER_REFFILE=$(VPATH)/ffserver.regression.ref
LIBAV_REFFILE=$(VPATH)/libav.regression.ref
-all fulltest: codectest libavtest test-server
-test: codectest libavtest test-server
+all fulltest test: codectest libavtest test-server
test-server: vsynth1/0.pgm asynth1.sw
@$(VPATH)/server-regression.sh $(SERVER_REFFILE) $(VPATH)/test.conf
OpenPOWER on IntegriCloud