[wget/f19] Fixed tests idn-cmd-utf8 and idn-robots-utf8 Re-enabled tests

Dan Horák sharkcz at fedoraproject.org
Mon Nov 3 12:09:19 UTC 2014


commit bb847b4ce5cb936273dc69b27c368cd97bb7b8fe
Author: Jakub Čajka <jcajka at redhat.com>
Date:   Mon Nov 3 12:12:45 2014 +0100

    Fixed tests idn-cmd-utf8 and idn-robots-utf8 Re-enabled tests

 ...-utf8-and-idn-robots-utf8-tests-on-archit.patch |   26 ++++++++++++++++++++
 wget.spec                                          |   12 +++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/0001-Fix-idn-cmd-utf8-and-idn-robots-utf8-tests-on-archit.patch b/0001-Fix-idn-cmd-utf8-and-idn-robots-utf8-tests-on-archit.patch
new file mode 100644
index 0000000..0fb5ea3
--- /dev/null
+++ b/0001-Fix-idn-cmd-utf8-and-idn-robots-utf8-tests-on-archit.patch
@@ -0,0 +1,26 @@
+From 8d7c4f611f8ec9e16b6345dc49e0d0b8704a8a30 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka at redhat.com>
+Date: Mon, 3 Nov 2014 10:34:48 +0100
+Subject: [PATCH] Fix idn-cmd-utf8 and idn-robots-utf8 tests on architectures
+ with unsigned char
+
+---
+ src/iri.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/iri.c b/src/iri.c
+index e38edc9..11f2bda 100644
+--- a/src/iri.c
++++ b/src/iri.c
+@@ -279,7 +279,7 @@ remote_to_utf8 (struct iri *iri, const char *str, const char **new)
+     {
+       const char *p = str;
+       for (p = str; *p; p++)
+-        if (*p < 0)
++        if (*p < 0 || *p > 127)
+           {
+             *new = strdup (str);
+             return true;
+-- 
+1.9.3
+
diff --git a/wget.spec b/wget.spec
index aca716e..7d39539 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Internet
 Url: http://www.gnu.org/software/wget/
@@ -10,6 +10,8 @@ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.xz
 Patch1: wget-rh-modified.patch
 Patch2: wget-1.15-path.patch
 Patch3: wget-1.16-dont-run-failing-test.patch
+# sent to upstream mailing list
+Patch4: 0001-Fix-idn-cmd-utf8-and-idn-robots-utf8-tests-on-archit.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
@@ -36,6 +38,7 @@ support for Proxy servers, and configurability.
 # don't run the Test-proxied-https-auth.px test since it fails with OpenSSL
 # upstream is working on fix and will be fixed most probably in 1.16.1
 %patch3 -p1 -b .test
+%patch4 -p1 -b .char
 
 %build
 if pkg-config openssl ; then
@@ -53,8 +56,7 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %find_lang %{name}
 
 %check
-# turn off test suite since IDN UTF-8 test are failing on arm
-# make check
+make check
 
 %post
 /sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir || :
@@ -76,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Mon Nov 03 2014 Jakub Čajka <jcajka at redhat.com> - 1.16-2
+- fix failing tests idn-cmd-utf8 and idn-robots-utf8
+- re-enabled tests
+
 * Fri Oct 31 2014 Tomas Hozza <thozza at redhat.com> - 1.16-1
 - update to 1.16
 - fixes CVE-2014-4877


More information about the scm-commits mailing list