[gmime] Added verbose debugging to figure out why gzip is failing on travis-ci
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime] Added verbose debugging to figure out why gzip is failing on travis-ci
- Date: Wed, 20 Dec 2017 17:10:57 +0000 (UTC)
commit c91caaec515e0aa80cd2c7c98140177be2ee83a3
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date: Thu Dec 14 23:07:51 2017 -0500
Added verbose debugging to figure out why gzip is failing on travis-ci
gmime/gmime-filter-gzip.c | 22 ++++++++++++++++++----
tests/test-filters.c | 5 ++++-
2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/gmime/gmime-filter-gzip.c b/gmime/gmime-filter-gzip.c
index 4c8fca3..8388419 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)) {
- w(fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg));
+ fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg);
break;
}
@@ -307,40 +307,52 @@ 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)
+ if (priv->stream->avail_in == 0) {
+ printf ("break out due to avail_in == 0\n");
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)) {
- w(fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg));
+ fprintf (stderr, "gzip: %d: %s\n", retval, priv->stream->msg);
break;
}
- if (priv->stream->avail_out > 0)
+ if (priv->stream->avail_out > 0) {
+ printf ("breakout due to avail_out > 0\n");
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);
@@ -367,6 +379,8 @@ gzip_filter (GMimeFilter *filter, char *in, size_t len, size_t prespace,
*out = filter->outbuf;
*outlen = filter->outsize - priv->stream->avail_out;
*outprespace = filter->outpre;
+
+ printf ("output %zu bytes\n", *outlen);
}
static void
diff --git a/tests/test-filters.c b/tests/test-filters.c
index cb91155..efde04a 100644
--- a/tests/test-filters.c
+++ b/tests/test-filters.c
@@ -134,7 +134,10 @@ test_gzip (const char *datadir, const char *filename)
g_free (path);
if (actual->len != expected->len || memcmp (actual->data, expected->data, actual->len) != 0) {
- testsuite_check_failed ("%s failed: %s", what, "streams do not match");
+ 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);
name = g_strdup_printf ("%s.1.gz", filename);
path = g_build_filename (datadir, name, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]