|
 |
597681 |
From 8c7d89af16b943ce8746c2838277c7033967308f Mon Sep 17 00:00:00 2001
|
|
|
597681 |
From: =?UTF-8?q?V=C4=9Bra=20Cholasta?= <vbudikov@redhat.com>
|
|
|
597681 |
Date: Wed, 17 Oct 2018 19:23:00 +0200
|
|
|
597681 |
Subject: [PATCH] test-isodetect: continue after failure
|
|
|
597681 |
MIME-Version: 1.0
|
|
|
597681 |
Content-Type: text/plain; charset=UTF-8
|
|
|
597681 |
Content-Transfer-Encoding: 8bit
|
|
|
597681 |
|
|
|
597681 |
https://bugzilla.redhat.com/show_bug.cgi?id=1639108
|
|
|
597681 |
|
|
|
597681 |
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
597681 |
---
|
|
|
597681 |
configure.ac | 4 ++--
|
|
|
597681 |
tests/test-isodetect.c | 7 +++++--
|
|
|
597681 |
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
597681 |
|
|
|
597681 |
diff --git a/configure.ac b/configure.ac
|
|
|
597681 |
index f7f1c72..c0917d4 100644
|
|
|
597681 |
--- a/configure.ac
|
|
|
597681 |
+++ b/configure.ac
|
|
|
597681 |
@@ -37,8 +37,8 @@ m4_if(m4_version_compare([2.61a.100],
|
|
|
597681 |
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
|
|
|
597681 |
|
|
|
597681 |
# Keep these two definitions in agreement.
|
|
|
597681 |
-GLIB_MINIMUM_VERSION="2.36"
|
|
|
597681 |
-GLIB_ENCODED_VERSION="GLIB_VERSION_2_36"
|
|
|
597681 |
+GLIB_MINIMUM_VERSION="2.38"
|
|
|
597681 |
+GLIB_ENCODED_VERSION="GLIB_VERSION_2_38"
|
|
|
597681 |
|
|
|
597681 |
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
|
|
|
597681 |
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
|
|
|
597681 |
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
|
|
|
597681 |
index b3834b9..b2a4e06 100644
|
|
|
597681 |
--- a/tests/test-isodetect.c
|
|
|
597681 |
+++ b/tests/test-isodetect.c
|
|
|
597681 |
@@ -396,8 +396,10 @@ static void test_one(const gchar *vendor)
|
|
|
597681 |
g_test_message("checking OS %s for ISO %s",
|
|
|
597681 |
info->shortid, info->filename);
|
|
|
597681 |
if (!matched) {
|
|
|
597681 |
- g_error("ISO %s was not matched by OS %s",
|
|
|
597681 |
- info->filename, info->shortid);
|
|
|
597681 |
+ g_printerr("ISO %s was not matched by OS %s\n/isodetect/%s: ",
|
|
|
597681 |
+ info->filename, info->shortid, vendor);
|
|
|
597681 |
+ g_test_fail();
|
|
|
597681 |
+ continue;
|
|
|
597681 |
}
|
|
|
597681 |
|
|
|
597681 |
g_object_get(info->media, "os", &os, NULL);
|
|
|
597681 |
@@ -417,6 +419,7 @@ int
|
|
|
597681 |
main(int argc, char *argv[])
|
|
|
597681 |
{
|
|
|
597681 |
g_test_init(&argc, &argv, NULL);
|
|
|
597681 |
+ g_test_set_nonfatal_assertions();
|
|
|
597681 |
|
|
|
597681 |
GList *vendors = load_vendors(NULL);
|
|
|
597681 |
GList *it;
|
|
|
597681 |
--
|
|
|
597681 |
2.19.1
|
|
|
597681 |
|