aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_repository_TEST_4_setup.sh
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_setup.sh
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_setup.sh')
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_4_setup.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_4_setup.sh b/paludis/repositories/e/e_repository_TEST_4_setup.sh
index 81b659374..0c28acc25 100755
--- a/paludis/repositories/e/e_repository_TEST_4_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_4_setup.sh
@@ -956,6 +956,8 @@ KEYWORDS="test"
S="${WORKDIR}"
+EXPECTED_MERGE_TYPE=source
+
pkg_setup() {
if [[ ${EXPECTED_MERGE_TYPE} != ${MERGE_TYPE} ]] ; then
die ${EXPECTED_MERGE_TYPE} is not ${MERGE_TYPE}
@@ -975,10 +977,13 @@ KEYWORDS="test"
S="${WORKDIR}"
+EXPECTED_MERGE_TYPE=buildonly
+
pkg_setup() {
if [[ ${EXPECTED_MERGE_TYPE} != ${MERGE_TYPE} ]] ; then
die ${EXPECTED_MERGE_TYPE} is not ${MERGE_TYPE}
fi
+ EXPECTED_MERGE_TYPE=binary
}
END
mkdir -p "cat/required-use-all-good" || exit 1