[FFmpeg-cvslog] tests/parseutils: change test to make it platform independent

Stefano Sabatini git at videolan.org
Tue Jun 12 00:58:31 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sun Jun 10 15:56:23 2012 +0200| [3ecaba677ed1f725043bed3b19198b2a8bf8c729] | committer: Stefano Sabatini

tests/parseutils: change test to make it platform independent

Make the test independent from the actual error string used to describe a
certain error code.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ecaba677ed1f725043bed3b19198b2a8bf8c729
---

 libavutil/parseutils.c    |    6 ++----
 tests/ref/fate/parseutils |   50 ++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 7a13d0b..66c31e1 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -723,12 +723,10 @@ int main(void)
 
         for (i = 0; i < FF_ARRAY_ELEMS(rates); i++) {
             int ret;
-            char err[1024];
             AVRational q = (AVRational){0, 0};
             ret = av_parse_video_rate(&q, rates[i]);
-            av_strerror(ret, err, sizeof(err));
-            printf("'%s' -> %d/%d ret:%s\n",
-                   rates[i], q.num, q.den, err);
+            printf("'%s' -> %d/%d%s\n",
+                   rates[i], q.num, q.den, ret ? " error" : "");
         }
     }
 
diff --git a/tests/ref/fate/parseutils b/tests/ref/fate/parseutils
index 992429f..042ebef 100644
--- a/tests/ref/fate/parseutils
+++ b/tests/ref/fate/parseutils
@@ -1,29 +1,29 @@
 Testing av_parse_video_rate()
-'-inf' -> -1/0 ret:Invalid argument
-'inf' -> 1/0 ret:Invalid argument
-'nan' -> 0/0 ret:Invalid argument
-'123/0' -> 1/0 ret:Invalid argument
-'-123 / 0' -> -1/0 ret:Invalid argument
-'' -> 0/0 ret:Invalid argument
-'/' -> 0/0 ret:Invalid argument
-' 123  /  321' -> 41/107 ret:Success
-'foo/foo' -> 0/0 ret:Invalid argument
-'foo/1' -> 0/0 ret:Invalid argument
-'1/foo' -> 1/0 ret:Invalid argument
-'0/0' -> 0/0 ret:Invalid argument
-'/0' -> 0/0 ret:Invalid argument
-'1/' -> 1/0 ret:Invalid argument
-'1' -> 1/1 ret:Success
-'0' -> 0/1 ret:Invalid argument
-'-123/123' -> -1/1 ret:Invalid argument
-'-foo' -> 0/0 ret:Invalid argument
-'123.23' -> 12323/100 ret:Success
-'.23' -> 23/100 ret:Success
-'-.23' -> -23/100 ret:Invalid argument
-'-0.234' -> -117/500 ret:Invalid argument
-'-0.0000001' -> 0/1 ret:Invalid argument
-'  21332.2324   ' -> 917286/43 ret:Success
-' -21332.2324   ' -> -917286/43 ret:Invalid argument
+'-inf' -> -1/0 error
+'inf' -> 1/0 error
+'nan' -> 0/0 error
+'123/0' -> 1/0 error
+'-123 / 0' -> -1/0 error
+'' -> 0/0 error
+'/' -> 0/0 error
+' 123  /  321' -> 41/107
+'foo/foo' -> 0/0 error
+'foo/1' -> 0/0 error
+'1/foo' -> 1/0 error
+'0/0' -> 0/0 error
+'/0' -> 0/0 error
+'1/' -> 1/0 error
+'1' -> 1/1
+'0' -> 0/1 error
+'-123/123' -> -1/1 error
+'-foo' -> 0/0 error
+'123.23' -> 12323/100
+'.23' -> 23/100
+'-.23' -> -23/100 error
+'-0.234' -> -117/500 error
+'-0.0000001' -> 0/1 error
+'  21332.2324   ' -> 917286/43
+' -21332.2324   ' -> -917286/43 error
 
 Testing av_parse_color()
 bikeshed -> R(80) G(64) B(140) A(59)



More information about the ffmpeg-cvslog mailing list