tests: be robust to quote style.

See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>.

	* src/main.c (main): Define the quoting style we use.
	* tests/atlocal.in: Use ASCII style quotes during the tests.

diff --git a/gnulib b/gnulib
index 50bb21eab7dfc87bbfcbc75f0232407110cdd296..4730c3e3692b344effb72d46b3ff92db0bdb797a 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 50bb21eab7dfc87bbfcbc75f0232407110cdd296
+Subproject commit 4730c3e3692b344effb72d46b3ff92db0bdb797a

diff --git a/src/main.c b/src/main.c
index fdb26ac69973fa2cbf476204d544d09b05ee3365..110813514509e35285bdf80c58972765ecbb1b45 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,7 @@
 #include "print.h"
 #include "print_graph.h"
 #include "print-xml.h"
 #include "print.h"
 #include "print_graph.h"
 #include "print-xml.h"

+#include <quote.h>

 #include "reader.h"
 #include "reduce.h"
 #include "scan-code.h"
 #include "reader.h"
 #include "reduce.h"
 #include "scan-code.h"


@@ -54,7 +55,6 @@
 #include "uniqstr.h"
 
 
 #include "uniqstr.h"
 
 

-

 int
 main (int argc, char *argv[])
 {
 int
 main (int argc, char *argv[])
 {


@@ -64,6 +64,14 @@ main (int argc, char *argv[])
   (void) bindtextdomain ("bison-runtime", LOCALEDIR);
   (void) textdomain (PACKAGE);
 
   (void) bindtextdomain ("bison-runtime", LOCALEDIR);
   (void) textdomain (PACKAGE);
 

+  {
+    char const *cp = getenv ("LC_CTYPE");
+    if (cp && STREQ (cp, "C"))
+      set_custom_quoting (&quote_quoting_options, "'", "'");
+    else
+      set_quoting_style (&quote_quoting_options, locale_quoting_style);
+  }
+

   atexit (close_stdout);
 
   uniqstrs_new ();
   atexit (close_stdout);
 
   uniqstrs_new ();

diff --git a/tests/atlocal.in b/tests/atlocal.in
index d34c1106401a2d2a1e603234047049b69c23ec7e..b66e95439c10138eb17b8e975d1c5a5812f73763 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -58,3 +58,7 @@ CONF_JAVA='@CONF_JAVA@'
 
 # We need egrep.
 : ${EGREP='@EGREP@'}
 
 # We need egrep.
 : ${EGREP='@EGREP@'}

+
+# Use simple quotes (lib/quote.c).
+LC_CTYPE=C
+export LC_CTYPE