aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-10-19 18:08:08 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-10-19 18:08:33 +0100
commitc704da4570607df09c9e82e07241da109e33aca1 (patch)
treee2a5a2c172ef18c67999b0081ac5bbfcf0839406
parent8149ee89ced125dfe71e78a24cb6b7fb63861b75 (diff)
downloadpaludis-c704da4570607df09c9e82e07241da109e33aca1.tar.gz
paludis-c704da4570607df09c9e82e07241da109e33aca1.tar.xz
RESTRICTing test doesn't mask expensive tests
Fixes: ticket:1205
-rw-r--r--paludis/repositories/e/ebuild_id.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 2f7d5c2..09283e2 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -1563,7 +1563,7 @@ EbuildID::add_build_options(const std::shared_ptr<Choices> & choices) const
)));
choices->add(build_options);
- bool mask_tests(false);
+ bool mask_tests(false), mask_expensive_tests(false);
if (! eapi()->supported()->is_pbin())
{
bool may_be_unrestricted_strip(true);
@@ -1594,7 +1594,10 @@ EbuildID::add_build_options(const std::shared_ptr<Choices> & choices) const
}
}
else
+ {
mask_tests = true;
+ mask_expensive_tests = true;
+ }
/* optional_tests */
if (eapi()->supported()->choices_options()->has_optional_tests())
@@ -1629,7 +1632,8 @@ EbuildID::add_build_options(const std::shared_ptr<Choices> & choices) const
}
if (has_expensive_test_phase)
- build_options->add(std::make_shared<ELikeExpensiveTestsChoiceValue>(shared_from_this(), _imp->environment, build_options, mask_tests));
+ build_options->add(std::make_shared<ELikeExpensiveTestsChoiceValue>(shared_from_this(), _imp->environment, build_options,
+ mask_expensive_tests));
}
/* trace */