summaryrefslogtreecommitdiff
path: root/test/libapt/gtest_runner.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-26 17:42:33 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-26 17:42:33 +0100
commitb7aa74a1859e3be00f3a20b0956d1cb93d62df5b (patch)
treef4fdf1cc1dc128d069056786b0f95fe72d80bbcf /test/libapt/gtest_runner.cc
parent2651f1c071927b7fc440ec7a638ecad7ccf04a2e (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/gtest_runner.cc')
-rw-r--r--test/libapt/gtest_runner.cc7
1 files changed, 6 insertions, 1 deletions
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;