diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-01-26 17:42:33 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-01-26 17:42:33 +0100 |
| commit | b7aa74a1859e3be00f3a20b0956d1cb93d62df5b (patch) | |
| tree | f4fdf1cc1dc128d069056786b0f95fe72d80bbcf /test/libapt/indexcopytosourcelist_test.cc | |
| parent | 2651f1c071927b7fc440ec7a638ecad7ccf04a2e (diff) | |
stablize gtest testcase environment
Avoid the dependency on a specific current path for the tar test and
ensure that _system is correctly initialized (gcc-6 runs into a segfault
otherwise and with it fixed starts to depend on the multi-arch
configuration of the running system… not good).
Git-Dch: Ignore
Diffstat (limited to 'test/libapt/indexcopytosourcelist_test.cc')
| -rw-r--r-- | test/libapt/indexcopytosourcelist_test.cc | 21 |
1 files changed, 19 insertions, 2 deletions
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)); + } } } } |