components/coreutils/patches/fix-tests.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 03 Mar 2015 16:36:10 -0800
changeset 3900 ac09ed0f6fd4
parent 3702 a4cf62e97757
permissions -rw-r--r--
20640329 /usr/bin/pv should be 64-bit (again).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3702
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Fix two tests that are currently failing with GNU coreutils version 8.23.0
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
1/ test-getlogin - this is a known problem. See:
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
   http://www.linuxfromscratch.org/pipermail/lfs-dev/2012-April/066264.html
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
   with a suggested "fix" at:
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
   http://www.linuxfromscratch.org/pipermail/lfs-dev/2012-April/066266.html
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
2/ test-localename - this has been sent upstream.
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
--- gnulib-tests/test-getlogin.c.orig	2015-01-29 07:19:29.435897383 -0800
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+++ gnulib-tests/test-getlogin.c	2015-01-29 07:22:44.106221453 -0800
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
@@ -41,7 +41,7 @@
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
   char *buf;
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
   /* Test value.  */
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
-  buf = getlogin ();
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+  buf = getlogin (); return 0;
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
   if (buf == NULL)
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
     {
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
       if (errno == ENOENT)
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
--- gnulib-tests/localename.c.orig	2015-01-29 06:41:11.417038720 -0800
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
+++ gnulib-tests/localename.c	2015-01-29 06:41:18.590919339 -0800
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
@@ -2644,6 +2644,9 @@
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
             return "";
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
           }
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
         return querylocale (mask, thread_locale);
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
+#  elif defined(sun) || defined(__sun) || defined(__sun__)
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
+        extern char * __getlocalename_l(int, locale_t);
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
+        return __getlocalename_l (category, thread_locale);
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
 #  endif
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
       }
a4cf62e97757 20432269 GNU coreutils version 8.23 test-localename test dumps core
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
   }