Set LC_MESSAGES to "C" in tests which run commands

ticket: 6918

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24964 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index be0715110400948a45d255fbf5b9de4b0fa0da5d..8f5ce7eff58b05f3de7531de0fd27f69186c01e6 100755 (executable)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -82,6 +82,9 @@ KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE
 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

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index ac9c82ae2339b2c664e0f71f226986dd4ac8c110..cbe46003185ae1d8df71c6d6e363e5f5ee789569 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -643,6 +643,9 @@ foreach i $runvarlist {
        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

diff --git a/src/util/k5test.py b/src/util/k5test.py
index a032d78b5baa59f52fa05c7dbc2e4248f0da967f..4a54ba6db00b3db105f7d150c43ea6524bf16086 100644 (file)
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -476,6 +476,8 @@ def _build_env():
             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