aboutsummaryrefslogtreecommitdiff
path: root/paludis/elike_choices.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-04 20:43:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-04 20:43:08 +0000
commit2b88556545a9c52908a8bed0f7856f8916ddc95f (patch)
tree657dbf5214653930a38545e072efcfbf1a94ae79 /paludis/elike_choices.hh
parent5d423e3e09364283c20cf989b980823b38ed461d (diff)
downloadpaludis-2b88556545a9c52908a8bed0f7856f8916ddc95f.tar.gz
paludis-2b88556545a9c52908a8bed0f7856f8916ddc95f.tar.xz
Mask rather than remove test build_options when restricted
Fixes: ticket:1058
Diffstat (limited to 'paludis/elike_choices.hh')
-rw-r--r--paludis/elike_choices.hh12
1 files changed, 9 insertions, 3 deletions
diff --git a/paludis/elike_choices.hh b/paludis/elike_choices.hh
index 832071a..9304c74 100644
--- a/paludis/elike_choices.hh
+++ b/paludis/elike_choices.hh
@@ -82,10 +82,12 @@ namespace paludis
{
private:
const bool _enabled;
+ const bool _mask;
public:
ELikeOptionalTestsChoiceValue(const std::shared_ptr<const PackageID> &,
- const Environment * const env, const std::shared_ptr<const Choice> &);
+ const Environment * const env, const std::shared_ptr<const Choice> &,
+ const bool mask);
virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -105,10 +107,12 @@ namespace paludis
{
private:
const bool _enabled;
+ const bool _mask;
public:
ELikeRecommendedTestsChoiceValue(const std::shared_ptr<const PackageID> &,
- const Environment * const env, const std::shared_ptr<const Choice> &);
+ const Environment * const env, const std::shared_ptr<const Choice> &,
+ const bool mask);
virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -128,10 +132,12 @@ namespace paludis
{
private:
const bool _enabled;
+ const bool _mask;
public:
ELikeExpensiveTestsChoiceValue(const std::shared_ptr<const PackageID> &,
- const Environment * const env, const std::shared_ptr<const Choice> &);
+ const Environment * const env, const std::shared_ptr<const Choice> &,
+ const bool mask);
virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result));