From 1c493315c5b1ba13cc68df85ba02fa06b13ad001 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 22 Oct 2010 19:10:49 +0200 Subject: =?UTF-8?q?dpkg=20doesn't=20like=20underscores=20in=20versions=20a?= =?UTF-8?q?nymore=20(=3Dit=20fails)=20so=20our=20behaviour=20can=20be=20un?= =?UTF-8?q?defined=E2=80=A6=20(or=20at=20least=20can't=20be=20tested=20aga?= =?UTF-8?q?inst=20dpkg)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/libapt/run-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/libapt') diff --git a/test/libapt/run-tests b/test/libapt/run-tests index 0f55f7386..f5fc03446 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -4,7 +4,7 @@ set -e local DIR=$(readlink -f $(dirname $0)) echo "Compiling the tests …" test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/" -$(cd $DIR && make) +(cd $DIR && make) echo "Running all testcases …" LDPATH="$DIR/../../build/bin" EXT="_libapt_test" -- cgit v1.2.3 From 037454791fe7e59b33531b640ac0aced3b2ba6d7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 6 Nov 2010 12:50:49 +0100 Subject: * apt-pkg/aptconfiguration.cc: - respect the none-force even in LANG=C (Closes: #602573) --- test/libapt/getlanguages_test.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test/libapt') diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 9a8910b58..14f1af185 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -85,6 +85,12 @@ int main(int argc,char *argv[]) equals(vec.size(), 1); equals(vec[0], "en"); + _config->Set("Acquire::Languages", "none"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 0); + _config->Set("Acquire::Languages", ""); + _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); env[0] = "de_DE.UTF-8"; -- cgit v1.2.3 From eb3947c6510042c054a319d8053821faf7244dea Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 9 Nov 2010 14:18:19 +0100 Subject: evaluate Acquire::Languages= before LANG= (Closes: #602573) --- test/libapt/getlanguages_test.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'test/libapt') diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 14f1af185..3559aae0c 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -89,6 +89,24 @@ int main(int argc,char *argv[]) env[0] = "C"; vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 0); + + _config->Set("Acquire::Languages", "environment"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "en"); + + _config->Set("Acquire::Languages", "de"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "de"); + + _config->Set("Acquire::Languages", "fr"); + env[0] = "ast_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 1); + equals(vec[0], "fr"); _config->Set("Acquire::Languages", ""); _config->Set("Acquire::Languages::1", "environment"); -- cgit v1.2.3