diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-30 12:27:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-30 12:27:03 +0000 |
| commit | d7167f05553df0ea1ff7da6c3d5760ab065600bd (patch) | |
| tree | 31f80dbf8163c47a5a7b357d616e0c4a03034fdb | |
| parent | 4ed886430c742849e8d382cd2b092ec2efab5fef (diff) | |
Move generated file aynth1.sw to the data subdirectory. Thus it does not have
to be removed separately and there is less clutter in the tests directory.
Originally committed as revision 18246 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | tests/codec-regression.sh | 2 |
2 files changed, 6 insertions, 5 deletions
@@ -115,7 +115,7 @@ uninstall-man: rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES)) testclean: - rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~ + rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/*~ clean:: testclean rm -f $(ALLPROGS) $(ALLPROGS_G) @@ -265,7 +265,7 @@ $(LAVF_REGFILES): $(LAVF_TESTS) $(CODEC_TESTS) $(LAVF_TESTS): regtest-ref -regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw +regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/data/asynth1.sw $(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(HOSTEXESUF) $(SRC_PATH)/tests/codec-regression.sh $@ vsynth tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)" @@ -277,7 +277,7 @@ $(LAVF_TESTS): seektest: codectest lavftest tests/seek_test$(EXESUF) $(SRC_PATH)/tests/seek-regression.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)" -ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw +ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @echo "Unfortunately ffserver is broken and therefore its regression" @echo "test fails randomly. Treat the results accordingly." @@ -292,7 +292,8 @@ tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) mkdir -p tests/vsynth2 $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm -tests/asynth1.sw: tests/audiogen$(HOSTEXESUF) +tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) + mkdir -p tests/data $(BUILD_ROOT)/$< $@ tests/%$(HOSTEXESUF): tests/%.c diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 3699fcf0aa..ff3bab24e8 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -29,7 +29,7 @@ bench2="$datadir/$this.bench2.tmp" raw_src="${target_path}/$3/%02d.pgm" raw_dst="$datadir/$this.out.yuv" raw_ref="$datadir/$2.ref.yuv" -pcm_src="${target_path}/tests/asynth1.sw" +pcm_src="$datadir/asynth1.sw" pcm_dst="$datadir/$this.out.wav" pcm_ref="$datadir/$2.ref.wav" crcfile="$datadir/$this.crc" |