diff options
| author |  Dimitry Ishenko <dimitry.ishenko@gmail.com>
| 2014-03-15 22:53:15 -0400 |
|---|---|---|
| committer |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2014-03-21 15:36:22 +0000 |
| commit | 1050ee7d3bf8cd37663c8506f50e19e2786987ac (patch) | |
| tree | 56273198eeaa3fdf52a9eb90c0878856c0069c3f | |
| parent | 3a35488e4b85c73ad201427b36e114347ad1cf09 (diff) | |
| download | paludis-1050ee7d3bf8cd37663c8506f50e19e2786987ac.tar.gz paludis-1050ee7d3bf8cd37663c8506f50e19e2786987ac.tar.xz | |
ResolverWithBinaryTestData: control binrepo importance
| -rw-r--r-- | paludis/resolver/resolver_test.cc | 5 | ||||
| -rw-r--r-- | paludis/resolver/resolver_test.hh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc index 0751f5ca5..f2a182806 100644 --- a/paludis/resolver/resolver_test.cc +++ b/paludis/resolver/resolver_test.cc @@ -140,7 +140,7 @@ ResolverTestData::ResolverTestData(const std::string & t, const std::string & e, make_unmaskable_filter_helper.set_override_masks(false); } -ResolverWithBinaryTestData::ResolverWithBinaryTestData(const std::string & t, const std::string & e, const std::string & l) : +ResolverWithBinaryTestData::ResolverWithBinaryTestData(const std::string & t, const std::string & e, const std::string & l, bool u) : ResolverTestData(t, e, l) { std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>()); @@ -155,10 +155,11 @@ ResolverWithBinaryTestData::ResolverWithBinaryTestData(const std::string & t, co keys->insert("binary_destination", "true"); keys->insert("binary_keywords_filter", "test ~test"); keys->insert("distdir", stringify(FSPath::cwd() / ("resolver_TEST_" + t + "_dir") / "distdir")); + keys->insert("binary_distdir", stringify(FSPath::cwd() / ("resolver_TEST_" + t + "_dir") / "distdir")); keys->insert("builddir", stringify(FSPath::cwd() / ("resolver_TEST_" + t + "_dir") / "build")); bin_repo = RepositoryFactory::get_instance()->create(&env, std::bind(from_keys, keys, std::placeholders::_1)); - env.add_repository(2, bin_repo); + env.add_repository(u ? 0 : 2, bin_repo); } ResolverFunctions diff --git a/paludis/resolver/resolver_test.hh b/paludis/resolver/resolver_test.hh index ad51653d3..75c512124 100644 --- a/paludis/resolver/resolver_test.hh +++ b/paludis/resolver/resolver_test.hh @@ -137,7 +137,7 @@ namespace paludis { std::shared_ptr<Repository> bin_repo; - ResolverWithBinaryTestData(const std::string & group, const std::string & eapi, const std::string & layout); + ResolverWithBinaryTestData(const std::string & group, const std::string & eapi, const std::string & layout, bool unimportant = false); }; struct ResolverTestCase : |