Skip tests on glibc-2.2 systems, which don't have LC_ALL_MASK.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 67ca5ff9d90e96be9631d90c12739923e87ec152..f029d539c2b9d4a2703f7916f9f7a72d168cb7de 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -2,6 +2,13 @@
 
        * gettext-0.15 released.
 
+2006-07-21  Bruno Haible  <bruno@clisp.org>
+
+       * gettext-6-prg.c: Enable the test only for glibc >= 2.3.
+       * gettext-7-prg.c: Likewise.
+       * gettext-6: Update.
+       * gettext-7: Likewise.
+
 2006-07-14  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (MOSTLYCLEANFILES): New variable.

diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index dd56c62df0b3eef15481904bf416deba06058859..fd17c6e1bfe83eef48699b7f9583baccbc38d06d 100755 (executable)
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -50,7 +50,14 @@ beaut
 EOF
 
 tmpfiles="$tmpfiles gt-6.out"
-./gettext-6-prg > gt-6.out || exit 1
+./gettext-6-prg > gt-6.out
+case $? in
+  0) ;;
+  77)
+    echo "Skipping test: not a glibc 2.3 system"
+    rm -fr $tmpfiles; exit 77
+    ;;
+esac
 
 : ${DIFF=diff}
 ${DIFF} gt-6.ok gt-6.out || exit 1

diff --git a/gettext-tools/tests/gettext-6-prg.c b/gettext-tools/tests/gettext-6-prg.c
index d59a16dad7597745ffada546e79b63798e6e97f8..95961dd77a1bbd7a168dd74e5392ef8813ef65ce 100644 (file)
--- a/gettext-tools/tests/gettext-6-prg.c
+++ b/gettext-tools/tests/gettext-6-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-6 test.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if USE_POSIX_THREADS && (__GLIBC__ >= 2)
+#if USE_POSIX_THREADS && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
 
 #include <pthread.h>
 #include "setenv.h"

diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index 598ee8c9ae8e26106b2f647a5a6f7dc534143bb6..3dc716c342eea6767cff7e58fe15295b973c3d1c 100755 (executable)
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -40,7 +40,14 @@ test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
 ${MSGFMT} -o de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-7.po
 
 tmpfiles="$tmpfiles gt-7.out"
-./gettext-7-prg > gt-7.out || exit 1
+./gettext-7-prg > gt-7.out
+case $? in
+  0) ;;
+  77)
+    echo "Skipping test: not a glibc 2.3 system"
+    rm -fr $tmpfiles; exit 77
+    ;;
+esac
 
 rm -fr $tmpfiles
 

diff --git a/gettext-tools/tests/gettext-7-prg.c b/gettext-tools/tests/gettext-7-prg.c
index 81325c3127a6aaa4e37a25911e58edf526f05196..3b04d5cf00344e2418ce79b5f441e7d3004f2191 100644 (file)
--- a/gettext-tools/tests/gettext-7-prg.c
+++ b/gettext-tools/tests/gettext-7-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-7 test.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if USE_POSIX_THREADS && (__GLIBC__ >= 2)
+#if USE_POSIX_THREADS && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
 
 #include <pthread.h>
 #include "setenv.h"