aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-12-14 20:04:32 +0100
committerClément Bœsch <ubitux@gmail.com>2011-12-14 20:04:44 +0100
commit54c7e81a53cd6c29d4f8673d83f53adef73e9b72 (patch)
tree6d1a42dd706eebf2cd2b06cf3d6090e0bb00d94f
parent9b01a8ad5ecf88aa0a8e52c2b70816e03ef59162 (diff)
downloadffmpeg-54c7e81a53cd6c29d4f8673d83f53adef73e9b72.tar.gz
fate: split off map_channel tests.
Also introduce a fate-mapchan rule for all of them.
-rw-r--r--tests/Makefile1
-rw-r--r--tests/fate/mapchan.mak14
-rw-r--r--tests/fate2.mak12
3 files changed, 15 insertions, 12 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 15675dc9e6..cddaa7cf74 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -51,6 +51,7 @@ include $(SRC_PATH)/tests/fate/dct.mak
include $(SRC_PATH)/tests/fate/fft.mak
include $(SRC_PATH)/tests/fate/h264.mak
include $(SRC_PATH)/tests/fate/libavutil.mak
+include $(SRC_PATH)/tests/fate/mapchan.mak
include $(SRC_PATH)/tests/fate/mp3.mak
include $(SRC_PATH)/tests/fate/prores.mak
include $(SRC_PATH)/tests/fate/vorbis.mak
diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak
new file mode 100644
index 0000000000..ebc7ee36ea
--- /dev/null
+++ b/tests/fate/mapchan.mak
@@ -0,0 +1,14 @@
+FATE_MAPCHAN += fate-mapchan-6ch-extract-2
+fate-mapchan-6ch-extract-2: tests/data/mapchan-6ch.sw
+fate-mapchan-6ch-extract-2: CMD = avconv -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5:
+
+FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono
+fate-mapchan-6ch-extract-2-downmix-mono: tests/data/mapchan-6ch.sw
+fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav
+
+FATE_MAPCHAN += fate-mapchan-silent-mono
+fate-mapchan-silent-mono: tests/data/mapchan-mono.sw
+fate-mapchan-silent-mono: CMD = md5 -ar 22050 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-mono.sw -map_channel -1 -map_channel 0.0.0 -f wav
+
+FATE_TESTS += $(FATE_MAPCHAN)
+fate-mapchan: $(FATE_MAPCHAN)
diff --git a/tests/fate2.mak b/tests/fate2.mak
index b06e0ab317..35583e40ab 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -137,18 +137,6 @@ FATE_TESTS += fate-g722enc
fate-g722enc: tests/data/asynth-16000-1.sw
fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
-FATE_TESTS += fate-mapchan-6ch-extract-2
-fate-mapchan-6ch-extract-2: tests/data/mapchan-6ch.sw
-fate-mapchan-6ch-extract-2: CMD = avconv -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5:
-
-FATE_TESTS += fate-mapchan-6ch-extract-2-downmix-mono
-fate-mapchan-6ch-extract-2-downmix-mono: tests/data/mapchan-6ch.sw
-fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav
-
-FATE_TESTS += fate-mapchan-silent-mono
-fate-mapchan-silent-mono: tests/data/mapchan-mono.sw
-fate-mapchan-silent-mono: CMD = md5 -ar 22050 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-mono.sw -map_channel -1 -map_channel 0.0.0 -f wav
-
FATE_TESTS += fate-msmpeg4v1
fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an