diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-02-25 17:21:44 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-03-13 13:58:45 +0100 |
| commit | be2337962df21addb8386f4262bde0ed0fbcad86 (patch) | |
| tree | 0d97580ceaff3563e3aa7f10ffb84a70e13c67fa | |
| parent | ce7f128c020e1347f91c6074238fc5da58c5df71 (diff) | |
unset LANGUAGE in the testing framework directly
Git-Dch: Ignore
| -rw-r--r-- | debian/tests/run-tests | 3 | ||||
| -rw-r--r-- | test/integration/framework | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e03db9b0c..41bafda99 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,9 +2,6 @@ set -e -unset LANGUAGE -export LC_ALL=C - # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then make startup diff --git a/test/integration/framework b/test/integration/framework index 9c4ac87d3..83deafe88 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -226,8 +226,6 @@ setupenvironment() { echo 'quiet::NoUpdate "true";' >> aptconfig.conf echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary - export LC_ALL=C.UTF-8 - export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' # gpg needs a trustdb to function, but it can't be invalid (not even empty) @@ -244,6 +242,9 @@ setupenvironment() { gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1 # cleanup the environment a bit + export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" + export LC_ALL=C.UTF-8 + unset LANGUAGE unset GREP_OPTIONS DEB_BUILD_PROFILES msgdone "info" |