unset LANGUAGE in the testing framework directly

Git-Dch: Ignore

diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index e03db9b0c7bdd0a786469995f42c1f08838b4d56..41bafda9982520b41a366d76d07ace3739188182 100644 (file)
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,9 +2,6 @@
 
 set -e
 
 
 set -e
 

-unset LANGUAGE
-export LC_ALL=C
-

 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
     make startup
 # 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 9c4ac87d3ec007355492a8c4dab546369b6245a5..83deafe8889d0efa80cb7ab2161bb0fec7061de3 100644 (file)
--- 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
        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)
        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
        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"
        unset GREP_OPTIONS DEB_BUILD_PROFILES
 
        msgdone "info"