diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-06-10 18:18:04 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-06-10 18:18:04 +0000 |
| commit | 9fb1be9f87e93a9dbd20fce3c9f6aaf1ca3405d2 (patch) | |
| tree | f9f8368046045d171a84a45c2d3e278985b21d0a | |
| parent | fabbf9e443459e8c0161c84563690ed70c7f6a61 (diff) | |
| download | krb5-9fb1be9f87e93a9dbd20fce3c9f6aaf1ca3405d2.tar.gz krb5-9fb1be9f87e93a9dbd20fce3c9f6aaf1ca3405d2.tar.xz krb5-9fb1be9f87e93a9dbd20fce3c9f6aaf1ca3405d2.zip | |
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
| -rwxr-xr-x | src/kadmin/testing/scripts/env-setup.shin | 3 | ||||
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 3 | ||||
| -rw-r--r-- | src/util/k5test.py | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin index be0715110..8f5ce7eff 100755 --- 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 ac9c82ae2..cbe460031 100644 --- 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 a032d78b5..4a54ba6db 100644 --- 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 |