aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_repository_TEST_4.cc
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-03-01 15:22:32 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-03-01 15:22:32 +0000
commit96768e54e2fdfc526edd2e939f20203e43b25a36 (patch)
tree67ef14735f46b396eb65a3f7c76554e073953214 /paludis/repositories/e/e_repository_TEST_4.cc
parent40ba4f033c892e0fc8ea779c697a86e9bf61cefd (diff)
downloadpaludis-96768e54e2fdfc526edd2e939f20203e43b25a36.tar.gz
paludis-96768e54e2fdfc526edd2e939f20203e43b25a36.tar.xz
Fix MERGE_TYPE
Unfortunately the test cases were broken in the same way as the feature itself, so it wasn't caught. Fixes: ticket:1323
Diffstat (limited to 'paludis/repositories/e/e_repository_TEST_4.cc')
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index a59014d1a..caccf2c0f 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -301,7 +301,6 @@ TEST(ERepository, EAPI4MergeType)
n::replacing() = std::make_shared<PackageIDSequence>(),
n::want_phase() = &want_all_phases
));
- ::setenv("EXPECTED_MERGE_TYPE", "source", 1);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-4::test-repo",
@@ -371,7 +370,6 @@ TEST(ERepository, EAPI4MergeTypeBin)
n::replacing() = std::make_shared<PackageIDSequence>(),
n::want_phase() = &want_all_phases
));
- ::setenv("EXPECTED_MERGE_TYPE", "buildonly", 1);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-bin-4::test-repo",
@@ -389,7 +387,6 @@ TEST(ERepository, EAPI4MergeTypeBin)
n::replacing() = std::make_shared<PackageIDSequence>(),
n::want_phase() = &want_all_phases
));
- ::setenv("EXPECTED_MERGE_TYPE", "binary", 1);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-bin-4::binrepo",