[01/20] tests: Use more consistent names for tests

Message ID 20180920084729.4523-2-diego@biurrun.de
State New
Headers show
Series
  • [01/20] tests: Use more consistent names for tests
Related show

Commit Message

Diego Biurrun Sept. 20, 2018, 8:47 a.m.
This will help refactor the test infrastructure.
---
 tests/fate/avformat.mak                    | 12 ++++++------
 tests/fate/seek.mak                        | 22 +++++++++++-----------
 tests/lavf-regression.sh                   | 18 +++++++++---------
 tests/ref/lavf/aiff                        |  6 +++---
 tests/ref/lavf/{alaw => al}                |  0
 tests/ref/lavf/{dv_fmt => dv}              |  0
 tests/ref/lavf/{flv_fmt => flv}            |  0
 tests/ref/lavf/{sunrast => sun}            |  0
 tests/ref/lavf/{mulaw => ul}               |  0
 tests/ref/lavf/voc_s16                     |  6 +++---
 tests/ref/lavf/{yuv4mpeg => y4m}           |  0
 tests/ref/seek/{lavf-alaw => lavf-al}      |  0
 tests/ref/seek/{lavf-dv_fmt => lavf-dv}    |  0
 tests/ref/seek/{lavf-flv_fmt => lavf-flv}  |  0
 tests/ref/seek/{lavf-mulaw => lavf-ul}     |  0
 tests/ref/seek/{lavf-yuv4mpeg => lavf-y4m} |  0
 16 files changed, 32 insertions(+), 32 deletions(-)
 rename tests/ref/lavf/{alaw => al} (100%)
 rename tests/ref/lavf/{dv_fmt => dv} (100%)
 rename tests/ref/lavf/{flv_fmt => flv} (100%)
 rename tests/ref/lavf/{sunrast => sun} (100%)
 rename tests/ref/lavf/{mulaw => ul} (100%)
 rename tests/ref/lavf/{yuv4mpeg => y4m} (100%)
 rename tests/ref/seek/{lavf-alaw => lavf-al} (100%)
 rename tests/ref/seek/{lavf-dv_fmt => lavf-dv} (100%)
 rename tests/ref/seek/{lavf-flv_fmt => lavf-flv} (100%)
 rename tests/ref/seek/{lavf-mulaw => lavf-ul} (100%)
 rename tests/ref/seek/{lavf-yuv4mpeg => lavf-y4m} (100%)

Patch

diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 458ae7cae9..6ffcde3f2b 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,12 +1,12 @@ 
 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)               += aiff
-FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += alaw
+FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += al
 FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)                 += au
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
 FATE_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)             += bmp
 FATE_LAVF-$(call ENCDEC,  DPX,                   IMAGE2)             += dpx
-FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv_fmt
-FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv_fmt
+FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv
+FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv
 FATE_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)             += gif
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
 FATE_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)             += jpg
@@ -14,7 +14,7 @@  FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
 FATE_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)                += mmf
 FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov
 FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)          += mulaw
+FATE_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)          += ul
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
@@ -31,7 +31,7 @@  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
-FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
+FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sun
 FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
 FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga
 FATE_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)             += tiff
@@ -40,7 +40,7 @@  FATE_LAVF-$(call ENCDEC,  PCM_U8,                VOC)                += voc
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             VOC)                += voc_s16
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav
 FATE_LAVF-$(call ENCDEC,  XWD,                   IMAGE2)             += xwd
-FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += yuv4mpeg
+FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += y4m
 
 FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
 FATE_LAVF += fate-lavf-pixfmt
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 60adab2085..c7e56f811a 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -145,13 +145,13 @@  FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
 # files from fate-lavf
 
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)        += aiff
-FATE_SEEK_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += alaw
+FATE_SEEK_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += al
 FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)         += asf
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)          += au
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)         += avi
 FATE_SEEK_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)      += bmp
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)         += dv_fmt
-FATE_SEEK_LAVF-$(call ENCDEC,  FLV,                   FLV)         += flv_fmt
+FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)         += dv
+FATE_SEEK_LAVF-$(call ENCDEC,  FLV,                   FLV)         += flv
 FATE_SEEK_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)      += gif
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)         += gxf
 FATE_SEEK_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)      += jpg
@@ -159,7 +159,7 @@  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)    += mkv
 FATE_SEEK_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)         += mmf
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)         += mov
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
-FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += mulaw
+FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += ul
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += mxf
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)         += nut
@@ -178,16 +178,16 @@  FATE_SEEK_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)      += tiff
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)      += ts
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_U8,                VOC)         += voc
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)         += wav
-FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += yuv4mpeg
+FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += y4m
 
-fate-seek-lavf-aiff:     SRC = lavf/lavf.aif
-fate-seek-lavf-alaw:     SRC = lavf/lavf.al
+fate-seek-lavf-aiff:     SRC = lavf/lavf.aiff
+fate-seek-lavf-al:       SRC = lavf/lavf.al
 fate-seek-lavf-asf:      SRC = lavf/lavf.asf
 fate-seek-lavf-au:       SRC = lavf/lavf.au
 fate-seek-lavf-avi:      SRC = lavf/lavf.avi
 fate-seek-lavf-bmp:      SRC = images/bmp/%02d.bmp
-fate-seek-lavf-dv_fmt:   SRC = lavf/lavf.dv
-fate-seek-lavf-flv_fmt:  SRC = lavf/lavf.flv
+fate-seek-lavf-dv:       SRC = lavf/lavf.dv
+fate-seek-lavf-flv:      SRC = lavf/lavf.flv
 fate-seek-lavf-gif:      SRC = lavf/lavf.gif
 fate-seek-lavf-gxf:      SRC = lavf/lavf.gxf
 fate-seek-lavf-jpg:      SRC = images/jpg/%02d.jpg
@@ -195,7 +195,7 @@  fate-seek-lavf-mkv:      SRC = lavf/lavf.mkv
 fate-seek-lavf-mmf:      SRC = lavf/lavf.mmf
 fate-seek-lavf-mov:      SRC = lavf/lavf.mov
 fate-seek-lavf-mpg:      SRC = lavf/lavf.mpg
-fate-seek-lavf-mulaw:    SRC = lavf/lavf.ul
+fate-seek-lavf-ul:       SRC = lavf/lavf.ul
 fate-seek-lavf-mxf:      SRC = lavf/lavf.mxf
 fate-seek-lavf-mxf_d10:  SRC = lavf/lavf.mxf_d10
 fate-seek-lavf-nut:      SRC = lavf/lavf.nut
@@ -214,7 +214,7 @@  fate-seek-lavf-tiff:     SRC = images/tiff/%02d.tiff
 fate-seek-lavf-ts:       SRC = lavf/lavf.ts
 fate-seek-lavf-voc:      SRC = lavf/lavf.voc
 fate-seek-lavf-wav:      SRC = lavf/lavf.wav
-fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m
+fate-seek-lavf-y4m:      SRC = lavf/lavf.y4m
 
 FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)
 
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index fd4f5548d0..18f000bbea 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -78,7 +78,7 @@  if [ -n "$do_swf" ] ; then
 do_lavf swf "" "-an"
 fi
 
-if [ -n "$do_flv_fmt" ] ; then
+if [ -n "$do_flv" ] ; then
 do_lavf flv "" "-an"
 fi
 
@@ -86,7 +86,7 @@  if [ -n "$do_mov" ] ; then
 do_lavf mov "" "-c:a pcm_alaw -c:v mpeg4"
 fi
 
-if [ -n "$do_dv_fmt" ] ; then
+if [ -n "$do_dv" ] ; then
 do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
 fi
 
@@ -127,8 +127,8 @@  do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qsca
 do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
 fi
 
-if [ -n "$do_yuv4mpeg" ] ; then
-file=${outfile}lavf.y4m
+if [ -n "$do_y4m" ] ; then
+file=${outfile}lavf.$test
 do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
 #do_avconv_crc $file -i $target_path/$file
 fi
@@ -183,7 +183,7 @@  if [ -n "$do_dpx" ] ; then
 do_image_formats dpx
 fi
 
-if [ -n "$do_sunrast" ] ; then
+if [ -n "$do_sun" ] ; then
 do_image_formats sun
 fi
 
@@ -193,11 +193,11 @@  if [ -n "$do_wav" ] ; then
 do_audio_only wav
 fi
 
-if [ -n "$do_alaw" ] ; then
+if [ -n "$do_al" ] ; then
 do_audio_only al "" "" "-ar 44100"
 fi
 
-if [ -n "$do_mulaw" ] ; then
+if [ -n "$do_ul" ] ; then
 do_audio_only ul "" "" "-ar 44100"
 fi
 
@@ -210,7 +210,7 @@  do_audio_only mmf
 fi
 
 if [ -n "$do_aiff" ] ; then
-do_audio_only aif
+do_audio_only aiff
 fi
 
 if [ -n "$do_voc" ] ; then
@@ -218,7 +218,7 @@  do_audio_only voc
 fi
 
 if [ -n "$do_voc_s16" ] ; then
-do_audio_only s16.voc "-ac 2" "-c:a pcm_s16le"
+do_audio_only voc_s16 "-ac 2" "-c:a pcm_s16le -f voc"
 fi
 
 if [ -n "$do_ogg" ] ; then
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index c713d02909..e0b0edee5e 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@ 
-9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aif
-88254 ./tests/data/lavf/lavf.aif
-./tests/data/lavf/lavf.aif CRC=0x3a1da17e
+9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aiff
+88254 ./tests/data/lavf/lavf.aiff
+./tests/data/lavf/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/al
similarity index 100%
rename from tests/ref/lavf/alaw
rename to tests/ref/lavf/al
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv
similarity index 100%
rename from tests/ref/lavf/dv_fmt
rename to tests/ref/lavf/dv
diff --git a/tests/ref/lavf/flv_fmt b/tests/ref/lavf/flv
similarity index 100%
rename from tests/ref/lavf/flv_fmt
rename to tests/ref/lavf/flv
diff --git a/tests/ref/lavf/sunrast b/tests/ref/lavf/sun
similarity index 100%
rename from tests/ref/lavf/sunrast
rename to tests/ref/lavf/sun
diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/ul
similarity index 100%
rename from tests/ref/lavf/mulaw
rename to tests/ref/lavf/ul
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
index deb7999485..776cc163fa 100644
--- a/tests/ref/lavf/voc_s16
+++ b/tests/ref/lavf/voc_s16
@@ -1,3 +1,3 @@ 
-e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.s16.voc
-176613 ./tests/data/lavf/lavf.s16.voc
-./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
+e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.voc_s16
+176613 ./tests/data/lavf/lavf.voc_s16
+./tests/data/lavf/lavf.voc_s16 CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/yuv4mpeg b/tests/ref/lavf/y4m
similarity index 100%
rename from tests/ref/lavf/yuv4mpeg
rename to tests/ref/lavf/y4m
diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-al
similarity index 100%
rename from tests/ref/seek/lavf-alaw
rename to tests/ref/seek/lavf-al
diff --git a/tests/ref/seek/lavf-dv_fmt b/tests/ref/seek/lavf-dv
similarity index 100%
rename from tests/ref/seek/lavf-dv_fmt
rename to tests/ref/seek/lavf-dv
diff --git a/tests/ref/seek/lavf-flv_fmt b/tests/ref/seek/lavf-flv
similarity index 100%
rename from tests/ref/seek/lavf-flv_fmt
rename to tests/ref/seek/lavf-flv
diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-ul
similarity index 100%
rename from tests/ref/seek/lavf-mulaw
rename to tests/ref/seek/lavf-ul
diff --git a/tests/ref/seek/lavf-yuv4mpeg b/tests/ref/seek/lavf-y4m
similarity index 100%
rename from tests/ref/seek/lavf-yuv4mpeg
rename to tests/ref/seek/lavf-y4m