Explorar el Código

unset LANGUAGE in the testing framework directly

Git-Dch: Ignore
David Kalnischkies hace 12 años
padre
commit
be2337962d
Se han modificado 2 ficheros con 3 adiciones y 5 borrados
  1. 0 3
      debian/tests/run-tests
  2. 3 2
      test/integration/framework

+ 0 - 3
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
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
 if [ ! -e environment.mak ]; then
     make startup
     make startup

+ 3 - 2
test/integration/framework

@@ -226,8 +226,6 @@ setupenvironment() {
 	echo 'quiet::NoUpdate "true";' >> aptconfig.conf
 	echo 'quiet::NoUpdate "true";' >> aptconfig.conf
 	echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https
 	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 "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'
 	configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
 
 
 	# gpg needs a trustdb to function, but it can't be invalid (not even empty)
 	# 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
 	gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1
 
 
 	# cleanup the environment a bit
 	# 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
 	unset GREP_OPTIONS DEB_BUILD_PROFILES
 
 
 	msgdone "info"
 	msgdone "info"