svn rev #24964: trunk/src/ kadmin/testing/scripts/ tests/dejagnu/config/ util/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24964
Commit By: ghudson
Log Message:
ticket: 6918

Set LC_MESSAGES to "C" in tests which run commands.


Changed Files:
U   trunk/src/kadmin/testing/scripts/env-setup.shin
U   trunk/src/tests/dejagnu/config/default.exp
U   trunk/src/util/k5test.py
Modified: trunk/src/kadmin/testing/scripts/env-setup.shin
===================================================================
--- trunk/src/kadmin/testing/scripts/env-setup.shin	2011-06-10 18:17:59 UTC (rev 24963)
+++ trunk/src/kadmin/testing/scripts/env-setup.shin	2011-06-10 18:18:04 UTC (rev 24964)
@@ -82,6 +82,9 @@
 KRB5_KTNAME=$K5ROOT/ovsec_adm.srvtab; export KRB5_KTNAME
 KRB5CCNAME=$K5ROOT/krb5cc_unit-test; export KRB5CCNAME
 
+# Make sure we don't get confused by translated messages.
+LC_MESSAGES=C; export LC_MESSAGES
+
 if [ "$TEST_SERVER" != "" ]; then
 	MAKE_KEYTAB="$MAKE_KEYTAB -server $TEST_SERVER"
 fi

Modified: trunk/src/tests/dejagnu/config/default.exp
===================================================================
--- trunk/src/tests/dejagnu/config/default.exp	2011-06-10 18:17:59 UTC (rev 24963)
+++ trunk/src/tests/dejagnu/config/default.exp	2011-06-10 18:18:04 UTC (rev 24964)
@@ -643,6 +643,9 @@
 	verbose "savelist $envvars_tosave"
 	lappend krb5_init_vars $i
     }
+    # Make sure we don't get confused by translated messages.
+    lappend envvars_tosave "LC_MESSAGES"
+    lappend krb5_init_vars "LC_MESSAGES=C"
 }
 set envstackp 0
 envstack_push

Modified: trunk/src/util/k5test.py
===================================================================
--- trunk/src/util/k5test.py	2011-06-10 18:17:59 UTC (rev 24963)
+++ trunk/src/util/k5test.py	2011-06-10 18:18:04 UTC (rev 24964)
@@ -476,6 +476,8 @@
             env[k] = os.path.join(buildtop, v)
         else:
             env[k] = v
+    # Make sure we don't get confused by translated messages.
+    env['LC_MESSAGES'] = 'C'
     return env