diff options
| -rw-r--r-- | test/libapt/extracttar_test.cc | 2 | ||||
| -rw-r--r-- | test/libapt/gtest_runner.cc | 7 | ||||
| -rw-r--r-- | test/libapt/indexcopytosourcelist_test.cc | 21 |
3 files changed, 26 insertions, 4 deletions
diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc index b4e1fd37f..0255bd767 100644 --- a/test/libapt/extracttar_test.cc +++ b/test/libapt/extracttar_test.cc @@ -20,7 +20,7 @@ class Stream : public pkgDirStream TEST(ExtractTar, ExtractTar) { - EXPECT_EQ(system("tar c makefile | gzip > tar.tgz"), 0); + EXPECT_EQ(system("tar c /etc/passwd 2>/dev/null | gzip > tar.tgz"), 0); FileFd fd("tar.tgz", FileFd::ReadOnly); unlink("tar.tgz"); diff --git a/test/libapt/gtest_runner.cc b/test/libapt/gtest_runner.cc index 46054afa3..73854d976 100644 --- a/test/libapt/gtest_runner.cc +++ b/test/libapt/gtest_runner.cc @@ -1,10 +1,15 @@ #include <gtest/gtest.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/pkgsystem.h> #include <apt-pkg/error.h> +#include <apt-pkg/init.h> int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); - int result = RUN_ALL_TESTS(); + if (pkgInitSystem(*_config, _system) == false) + return 42; + int const result = RUN_ALL_TESTS(); if (_error->empty() == false) { std::cerr << "The test generated the following global messages:" << std::endl; diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc index 2d07dba15..eb6d49edf 100644 --- a/test/libapt/indexcopytosourcelist_test.cc +++ b/test/libapt/indexcopytosourcelist_test.cc @@ -9,9 +9,9 @@ #include <gtest/gtest.h> -class NoCopy : public IndexCopy { +class NoCopy : private IndexCopy { public: - std::string ConvertToSourceList(std::string CD,std::string Path) { + std::string ConvertToSourceList(std::string const &CD,std::string &&Path) { IndexCopy::ConvertToSourceList(CD, Path); return Path; } @@ -44,13 +44,20 @@ TEST(IndexCopyTest, ConvertToSourceList) std::string const S = Path + "source/"; std::string const List = std::string(*Release) + " " + *Component; + { + SCOPED_TRACE("no archs configured"); _config->Clear("APT"); + _config->Set("APT::Architecture", "all"); + _config->Set("APT::Architectures::", "all"); APT::Configuration::getArchitectures(false); EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A)); EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B)); EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S)); + } + { + SCOPED_TRACE("mips configured"); _config->Clear("APT"); _config->Set("APT::Architecture", "mips"); _config->Set("APT::Architectures::", "mips"); @@ -59,7 +66,10 @@ TEST(IndexCopyTest, ConvertToSourceList) EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B)); EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S)); + } + { + SCOPED_TRACE("kfreebsd-mips configured"); _config->Clear("APT"); _config->Set("APT::Architecture", "kfreebsd-mips"); _config->Set("APT::Architectures::", "kfreebsd-mips"); @@ -68,7 +78,10 @@ TEST(IndexCopyTest, ConvertToSourceList) EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + C)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S)); + } + { + SCOPED_TRACE("armel configured"); _config->Clear("APT"); _config->Set("APT::Architecture", "armel"); _config->Set("APT::Architectures::", "armel"); @@ -77,7 +90,10 @@ TEST(IndexCopyTest, ConvertToSourceList) EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B)); EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S)); + } + { + SCOPED_TRACE("armel+mips configured"); _config->Clear("APT"); _config->Set("APT::Architecture", "armel"); _config->Set("APT::Architectures::", "armel"); @@ -87,6 +103,7 @@ TEST(IndexCopyTest, ConvertToSourceList) EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B)); EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C)); EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S)); + } } } } |