[gmime] Another attempt at debugging gzip on travis-ci

[Jeffrey Stedfast <fejj src gnome org>]

commit 1d58fa093df531fa4b3cae356c4dbacca74821f4
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Thu Dec 14 23:37:33 2017 -0500

    Another attempt at debugging gzip on travis-ci

 gmime/gmime-filter-gzip.c |   20 ++++----------------
 tests/test-filters.c      |   18 ++++++++++++++----
 2 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/gmime/gmime-filter-gzip.c b/gmime/gmime-filter-gzip.c
index f8e638a..f71dcd9 100644
--- a/gmime/gmime-filter-gzip.c
+++ b/gmime/gmime-filter-gzip.c
@@ -299,7 +299,7 @@ gzip_filter (GMimeFilter *filter, char *in, size_t len, size_t prespace,
                retval = deflate (priv->stream, Z_NO_FLUSH);
                
                if (retval != Z_OK && !(retval == Z_BUF_ERROR && !priv->stream->avail_in)) {
-                       fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg);
+                       w(fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg));
                        break;
                }
                
@@ -307,52 +307,40 @@ gzip_filter (GMimeFilter *filter, char *in, size_t len, size_t prespace,
                        if (priv->stream->avail_in > 0) {
                                g_mime_filter_backup (filter, (char *) priv->stream->next_in,
                                                      priv->stream->avail_in);
-                               printf ("backup %u bytes\n", priv->stream->avail_in);
                        }
-                       printf ("break out due to avail_out > 0\n");
                        break;
                }
                
-               if (priv->stream->avail_in == 0) {
-                       printf ("break out due to avail_in == 0\n");
+               if (priv->stream->avail_in == 0)
                        break;
-               }
                
                olen = filter->outsize - priv->stream->avail_out;
                atleast = next_alloc_size (olen + priv->stream->avail_in * 2);
                g_mime_filter_set_size (filter, atleast, TRUE);
                priv->stream->next_out = (unsigned char *) filter->outbuf + olen;
                priv->stream->avail_out = filter->outsize - olen;
-               printf ("resize outbuf to %zu\n", filter->outsize);
        } while (1);
        
        if (flush) {
                guint32 val;
                
-               printf ("flush\n");
-               
                do {
                        retval = deflate (priv->stream, Z_FULL_FLUSH);
                        
                        if (retval != Z_OK && !(retval == Z_BUF_ERROR && !priv->stream->avail_in)) {
-                               fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg);
+                               w(fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg));
                                break;
                        }
                        
-                       if (priv->stream->avail_out > 0) {
-                               printf ("breakout due to avail_out > 0\n");
+                       if (priv->stream->avail_out > 0)
                                break;
-                       }
                        
                        olen = filter->outsize;
                        g_mime_filter_set_size (filter, olen + 1024, TRUE);
                        priv->stream->next_out = (unsigned char *) filter->outbuf + olen;
                        priv->stream->avail_out = filter->outsize - olen;
-                       printf ("resize outbuf to %zu\n", filter->outsize);
                } while (1);
                
-               printf ("output isize and crc\n");
-               
                if (priv->stream->avail_out < 8) {
                        olen = filter->outsize;
                        g_mime_filter_set_size (filter, olen + 8, TRUE);
diff --git a/tests/test-filters.c b/tests/test-filters.c
index efde04a..b206cf0 100644
--- a/tests/test-filters.c
+++ b/tests/test-filters.c
@@ -134,10 +134,20 @@ test_gzip (const char *datadir, const char *filename)
        g_free (path);
        
        if (actual->len != expected->len || memcmp (actual->data, expected->data, actual->len) != 0) {
-               if (actual->len != expected->len)
-                       testsuite_check_failed ("%s failed: streams are not the same length: %u", what, 
actual->len);
-               else
-                       testsuite_check_failed ("%s failed: streams do not match", what);
+               //if (actual->len != expected->len)
+               //      testsuite_check_failed ("%s failed: streams are not the same length: %u", what, 
actual->len);
+               //else
+               //      testsuite_check_failed ("%s failed: streams do not match", what);
+               
+               guint min = MIN (actual->len, expected->len);
+               guint i;
+               
+               for (i = 0; i < min; i++) {
+                       if (actual->pdata[i] != expected->pdata[i])
+                               break;
+               }
+               
+               testsuite_check_failed ("%s failed: streams do not match at index %u", what, i);
                
                name = g_strdup_printf ("%s.1.gz", filename);
                path = g_build_filename (datadir, name, NULL);