From 191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 13 Jul 2011 02:09:19 +0200 Subject: [PATCH] build: move tests/seek_test.c to libavformat and reuse generic build rules --- .gitignore | 1 - libavformat/Makefile | 2 +- tests/seek_test.c => libavformat/seek-test.c | 0 tests/Makefile | 6 +----- tests/fate-run.sh | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) rename tests/seek_test.c => libavformat/seek-test.c (100%) diff --git a/.gitignore b/.gitignore index 59a0860759..bfce23d311 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ tests/audiogen tests/base64 tests/data tests/rotozoom -tests/seek_test tests/tiny_psnr tests/videogen tests/vsynth1 diff --git a/libavformat/Makefile b/libavformat/Makefile index ca337e0167..917b38a0d8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -334,7 +334,7 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_JACK_INDEV) += timefilter.o EXAMPLES = metadata output -TESTPROGS = timefilter +TESTPROGS = seek timefilter TOOLS = pktdumper probetest include $(SRC_PATH)/subdir.mak diff --git a/tests/seek_test.c b/libavformat/seek-test.c similarity index 100% rename from tests/seek_test.c rename to libavformat/seek-test.c diff --git a/tests/Makefile b/tests/Makefile index 35e803d102..4739446674 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -28,9 +28,6 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN -tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) -o $@ $< $(FF_EXTRALIBS) - include $(SRC_PATH)/tests/fate.mak include $(SRC_PATH)/tests/fate2.mak @@ -64,7 +61,7 @@ $(filter-out %-aref,$(FATE_ACODEC)): $(AREF) $(filter-out %-vref,$(FATE_VCODEC)): $(VREF) $(FATE_LAVF): $(REFS) $(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) -$(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) +$(FATE_SEEK): fate-codec fate-lavf libavformat/seek-test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec $(FATE_VSYNTH1): CMD = codectest vsynth1 @@ -107,7 +104,6 @@ clean:: testclean testclean: $(RM) -r tests/vsynth1 tests/vsynth2 tests/data $(RM) $(CLEANSUFFIXES:%=tests/%) - $(RM) tests/seek_test$(EXESUF) tests/seek_test.o $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) -include $(wildcard tests/*.d) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 10497c497e..4121035853 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -104,7 +104,7 @@ seektest(){ file=$(echo tests/data/$d/$file) ;; esac - $target_exec $target_path/tests/seek_test $target_path/$file + $target_exec $target_path/libavformat/seek-test $target_path/$file } mkdir -p "$outdir"