]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
gettext: Fix testsuite.
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 30 Dec 2011 21:22:06 +0000 (22:22 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 30 Dec 2011 21:22:06 +0000 (22:22 +0100)
Reference #307

gettext/gettext.nm
gettext/patches/gettext-readlink-einval.patch [new file with mode: 0644]

index f3eaa8c17d8d8775a3b30b7215ae79f770cd75cc..b44f2d53de0db5d937a77ccb15c6dbfd341cb01c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = gettext
 version    = 0.18.1.1
-release    = 4
+release    = 5
 
 groups     = System/Base
 url        = http://www.gnu.org/software/gettext/
@@ -40,10 +40,9 @@ build
                --enable-shared \
                --disable-rpath
 
-# Disable testsuite - it's broken ( readlink test )
-#      test
-#              make check
-#      end
+       test
+               make check
+       end
 
        install_cmds
                # cleanup rpaths
diff --git a/gettext/patches/gettext-readlink-einval.patch b/gettext/patches/gettext-readlink-einval.patch
new file mode 100644 (file)
index 0000000..4cc9092
--- /dev/null
@@ -0,0 +1,24 @@
+diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h  2010-02-16 16:32:26.000000000 -0500
++++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h       2011-08-31 16:16:26.325521167 -0400
+@@ -36,7 +36,7 @@ test_areadlink (char * (*func) (char con
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", 1) == NULL);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", 1) == NULL);
+   ASSERT (errno == EINVAL);
+diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h   2011-08-31 15:54:15.000000000 -0400
++++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h        2011-08-31 16:16:09.325165556 -0400
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);