From 29b2aec2338b6375c12d89f63a530ebc5e6406b2 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sat, 2 Nov 2013 14:10:23 +0000 Subject: wget darwin: disable Test-iri-disabled.px This test fails on MacOS X. The failure has something to do with the tests expecting filesystems to accept/store filenames as bytes. On the HFS+ filesystem, however, filenames are Unicode characters (Normalisation Form D). This wget ticket appears to be relevant http://savannah.gnu.org/bugs/index.php?27541 The maintainer does not seem to think that this test failure represents a problem in practice: http://article.gmane.org/gmane.comp.web.wget.general/8988 But this patch should be revisited/removed if this aspect of wget is ever addressed in the future. NB: I'm also a bit concerned/confused that none of the tests mentioned in that message seem to fail, so I'm not 100% sure if this is the relevant issue. --- pkgs/tools/networking/wget/default.nix | 2 ++ pkgs/tools/networking/wget/iri-test.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/wget/iri-test.patch (limited to 'pkgs/tools/networking/wget') diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3e3b74dfe902..5ae85adbec7e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch new file mode 100644 index 000000000000..c1f798ce3726 --- /dev/null +++ b/pkgs/tools/networking/wget/iri-test.patch @@ -0,0 +1,12 @@ +diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px +--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 ++++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 +@@ -48,7 +48,7 @@ + 'Test-idn-robots-utf8.px', + 'Test-iri.px', + 'Test-iri-percent.px', +- 'Test-iri-disabled.px', ++ #'Test-iri-disabled.px', + 'Test-iri-forced-remote.px', + 'Test-iri-list.px', + 'Test-k.px', -- cgit 1.4.1