[libsoup/wip/smcv/xmlrpc-tests-glib-2-62] xmlrpc tests: Cope with GLib 2.62 TAP output



commit da628c62079ba446986f1ceb8fc42763e392b05d
Author: Simon McVittie <smcv debian org>
Date:   Sun Oct 6 16:44:15 2019 +0100

    xmlrpc tests: Cope with GLib 2.62 TAP output
    
    In GLib 2.62, "some-test-executable -l" outputs TAP headers before the
    list of tests. Ignore those lines.
    
    Signed-off-by: Simon McVittie <smcv debian org>

 tests/xmlrpc-old-server-test.c | 6 ++++++
 tests/xmlrpc-server-test.c     | 6 ++++++
 2 files changed, 12 insertions(+)
---
diff --git a/tests/xmlrpc-old-server-test.c b/tests/xmlrpc-old-server-test.c
index a7076b5a..e8e440a2 100644
--- a/tests/xmlrpc-old-server-test.c
+++ b/tests/xmlrpc-old-server-test.c
@@ -344,6 +344,12 @@ main (int argc, char **argv)
                g_free (out);
 
                for (i = 0; tests[i] && *tests[i]; i++) {
+                       if (tests[i][0] == '#') {
+                               continue;
+                       }
+                       if (g_str_has_prefix (tests[i], "1..")) {
+                               continue;
+                       }
                        g_assert_true (g_str_has_prefix (tests[i], "/xmlrpc-old/"));
                        path = g_strdup_printf ("/xmlrpc-old-server/%s", tests[i] + strlen ("/xmlrpc-old/"));
                        g_test_add_data_func (path, tests[i], do_one_xmlrpc_test);
diff --git a/tests/xmlrpc-server-test.c b/tests/xmlrpc-server-test.c
index 80f04ea8..90d74f26 100644
--- a/tests/xmlrpc-server-test.c
+++ b/tests/xmlrpc-server-test.c
@@ -344,6 +344,12 @@ main (int argc, char **argv)
                g_free (out);
 
                for (i = 0; tests[i] && *tests[i]; i++) {
+                       if (tests[i][0] == '#') {
+                               continue;
+                       }
+                       if (g_str_has_prefix (tests[i], "1..")) {
+                               continue;
+                       }
                        g_assert_true (g_str_has_prefix (tests[i], "/xmlrpc/"));
                        path = g_strdup_printf ("/xmlrpc-server/%s", tests[i] + strlen ("/xmlrpc/"));
                        g_test_add_data_func (path, tests[i], do_one_xmlrpc_test);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]