Test multithreaded gettext().

diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
new file mode 100755 (executable)
index 0000000..2ff145c
--- /dev/null
+++ b/gettext-tools/tests/gettext-7
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Test that on glibc systems, gettext() in multithreaded applications works
+# correctly if different threads operate in different locales referring to
+# the same catalog file but with different encodings.
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+# This test works only on glibc systems.
+grep '@GLIBC2@.*yes' ../config.status >/dev/null || exit 77
+
+# This test works only on systems that have a de_DE.ISO-8859-1 and
+# de_DE.UTF-8 locale installed.
+LC_ALL=de_DE.ISO-8859-1 ./testlocale || exit 77
+LC_ALL=de_DE.UTF-8      ./testlocale || exit 77
+
+tmpfiles="$tmpfiles de_DE"
+test -d de_DE || mkdir de_DE
+test -d de_DE/LC_MESSAGES || mkdir de_DE/LC_MESSAGES
+
+: ${MSGFMT=msgfmt}
+${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
+
+rm -fr $tmpfiles
+
+exit 0

diff --git a/gettext-tools/tests/gettext-7-prg.c b/gettext-tools/tests/gettext-7-prg.c
new file mode 100644 (file)
index 0000000..158f85e
--- /dev/null
+++ b/gettext-tools/tests/gettext-7-prg.c
@@ -0,0 +1,175 @@
+/* Test program, used by the gettext-7 test.
+   Copyright (C) 2005 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Bruno Haible <haible@clisp.cons.org>, 2005.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if USE_POSIX_THREADS
+
+#include <locale.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "setenv.h"
+
+/* Make sure we use the included libintl, not the system's one. */
+#undef _LIBINTL_H
+#include "libgnuintl.h"
+
+/* Set to 1 if the program is not behaving correctly.  */
+int result;
+
+/* Denotes which thread should run next.  */
+int flipflop;
+/* Lock and wait queue used to switch between the threads.  */
+pthread_mutex_t lock;
+pthread_cond_t waitqueue;
+
+/* Waits until the flipflop has a given value.
+   Before the call, the lock is unlocked.  After the call, it is locked.  */
+static void
+waitfor (int value)
+{
+  if (pthread_mutex_lock (&lock))
+    exit (10);
+  while (flipflop != value)
+    if (pthread_cond_wait (&waitqueue, &lock))
+      exit (11);
+}
+
+/* Sets the flipflop to a given value.
+   Before the call, the lock is locked.  After the call, it is unlocked.  */
+static void
+setto (int value)
+{
+  flipflop = value;
+  if (pthread_cond_signal (&waitqueue))
+    exit (20);
+  if (pthread_mutex_unlock (&lock))
+    exit (21);
+}
+
+void *
+thread1_execution (void *arg)
+{
+  char *s;
+
+  waitfor (1);
+  uselocale (newlocale (LC_ALL_MASK, "de_DE.ISO-8859-1", NULL));
+  setto (2);
+
+  /* Here we expect output in ISO-8859-1.  */
+
+  waitfor (1);
+  s = gettext ("cheese");
+  puts (s);
+  if (strcmp (s, "K\344se"))
+    {
+      fprintf (stderr, "thread 1 call 1 returned: %s\n", s);
+      result = 1;
+    }
+  setto (2);
+
+  waitfor (1);
+  s = gettext ("cheese");
+  puts (s);
+  if (strcmp (s, "K\344se"))
+    {
+      fprintf (stderr, "thread 1 call 2 returned: %s\n", s);
+      result = 1;
+    }
+  setto (2);
+
+  return NULL;
+}
+
+void *
+thread2_execution (void *arg)
+{
+  char *s;
+
+  waitfor (2);
+  uselocale (newlocale (LC_ALL_MASK, "de_DE.UTF-8", NULL));
+  setto (1);
+
+  /* Here we expect output in UTF-8.  */
+
+  waitfor (2);
+  s = gettext ("cheese");
+  puts (s);
+  if (strcmp (s, "K\303\244se"))
+    {
+      fprintf (stderr, "thread 2 call 1 returned: %s\n", s);
+      result = 1;
+    }
+  setto (1);
+
+  waitfor (2);
+  s = gettext ("cheese");
+  puts (s);
+  if (strcmp (s, "K\303\244se"))
+    {
+      fprintf (stderr, "thread 2 call 2 returned: %s\n", s);
+      result = 1;
+    }
+  setto (1);
+
+  return NULL;
+}
+
+int
+main (void)
+{
+  pthread_t thread1;
+  pthread_t thread2;
+
+  unsetenv ("LANGUAGE");
+  unsetenv ("OUTPUT_CHARSET");
+  textdomain ("tstthread");
+  bindtextdomain ("tstthread", ".");
+  result = 0;
+
+  flipflop = 1;
+  if (pthread_mutex_init (&lock, NULL))
+    exit (2);
+  if (pthread_cond_init (&waitqueue, NULL))
+    exit (2);
+  if (pthread_create (&thread1, NULL, &thread1_execution, NULL))
+    exit (2);
+  if (pthread_create (&thread2, NULL, &thread2_execution, NULL))
+    exit (2);
+  if (pthread_join (thread2, NULL))
+    exit (3);
+
+  return result;
+}
+
+#else
+
+/* This test is not executed.  */
+
+int
+main (void)
+{
+  return 77;
+}
+
+#endif

diff --git a/gettext-tools/tests/gettext-7.po b/gettext-tools/tests/gettext-7.po
new file mode 100644 (file)
index 0000000..9a6231d
--- /dev/null
+++ b/gettext-tools/tests/gettext-7.po
@@ -0,0 +1,8 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+msgid "cheese"
+msgstr "Käse"