summaryrefslogtreecommitdiff
path: root/test-suite/standalone
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-23 14:10:22 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-23 14:10:22 +0100
commit9d15db65ffd49fd8fda77dcb6b70c3c930ae5153 (patch)
tree3fa57da41d8f2629649c82428ad828f5f3147d2e /test-suite/standalone
parent3c65e3fda512cda13de244e853afd0fa0e7b5962 (diff)
parenta2e946f1ef83cd1fd8c87412cc49f6c6d1e0ac61 (diff)
downloadguile-9d15db65ffd49fd8fda77dcb6b70c3c930ae5153.tar.gz
Merge remote-tracking branch 'local-2.0/stable-2.0'
Conflicts: module/language/tree-il/analyze.scm
Diffstat (limited to 'test-suite/standalone')
-rw-r--r--test-suite/standalone/Makefile.am5
-rwxr-xr-xtest-suite/standalone/test-command-line-encoding220
2 files changed, 24 insertions, 1 deletions
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index d8cfafa25..daa3d0744 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in.
##
## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-## 2011 Free Software Foundation, Inc.
+## 2011, 2012 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -85,6 +85,9 @@ EXTRA_DIST += test-import-order-a.scm test-import-order-b.scm \
check_SCRIPTS += test-command-line-encoding
TESTS += test-command-line-encoding
+check_SCRIPTS += test-command-line-encoding2
+TESTS += test-command-line-encoding2
+
# test-num2integral
test_num2integral_SOURCES = test-num2integral.c
test_num2integral_CFLAGS = ${test_cflags}
diff --git a/test-suite/standalone/test-command-line-encoding2 b/test-suite/standalone/test-command-line-encoding2
new file mode 100755
index 000000000..536945bc2
--- /dev/null
+++ b/test-suite/standalone/test-command-line-encoding2
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Choose a locale name that lacks a dot followed by the encoding name.
+# This should not confuse `environ_locale_charset'.
+# See <http://bugs.gnu.org/10742> for the original bug report.
+LC_ALL="en_US"
+export LC_ALL
+unset LANG
+unset LC_CTYPE
+
+exec guile -q -s "$0" "hello"
+!#
+
+;; Make sure our argument was suitable decoded.
+(exit (string=? (cadr (program-arguments)) "hello"))
+
+;; Local Variables:
+;; mode: scheme
+;; coding: iso-8859-1
+;; End: