diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/qmerge/dotest | 15 | ||||
-rw-r--r-- | tests/qmerge/packages/Packages | 6 | ||||
-rw-r--r-- | tests/qmerge/packages/sys-devel/qmerge-test-1.3.tbz2 | bin | 7264 -> 7289 bytes |
3 files changed, 17 insertions, 4 deletions
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest index 23f3ca73..1bbf5f7e 100755 --- a/tests/qmerge/dotest +++ b/tests/qmerge/dotest @@ -29,7 +29,7 @@ out=$(yes | qmerge -F qmerge-test) tend $? "qmerge-test: [N] basic merge" || die "${out}" [[ ${out} != *"FAIL"* ]] -tend $? "qmerge-test: [N] FAIL messages" || die "${out}" +tend $? "qmerge-test: [N] no FAIL messages" || die "${out}" order=$(echo "${out}" | awk '$1 == ">>>" && $2 ~ /^pkg_/ { printf "%s ", $NF }') [[ ${order} == "pkg_pretend pkg_setup pkg_preinst pkg_postinst " ]] @@ -105,6 +105,19 @@ tend $? "qmerge-test: [M] uninstall" || die "${out}" [[ ! -e ${ROOT}/etc ]] tend $? "qmerge-test: [M] /etc removed" || die "$(treedir "${ROOT}")" +export INSTALL_MASK="/usr -/usr/bin/dummy" +out=$(yes | qmerge -F qmerge-test) +tend $? "qmerge-test: [M] install only /usr/bin/dummy" || die "${out}" +[[ -e ${ROOT}/usr/bin/dummy ]] +tend $? "qmerge-test: [M] found /usr/bin/dummy" || die "$(treedir "${ROOT}")" +[[ ! -e ${ROOT}/usr/bin/qmerge-test ]] +tend $? "qmerge-test: [M] /usr/bin/qmerge-test absent" || die "$(treedir "${ROOT}")" + +out=$(yes | qmerge -FU qmerge-test) +tend $? "qmerge-test: [M] uninstall" || die "${out}" +[[ ! -e ${ROOT}/usr/bin/dummy ]] +tend $? "qmerge-test: [M] /usr/bin/dummy removed" || die "$(treedir "${ROOT}")" + set -e cleantmpdir diff --git a/tests/qmerge/packages/Packages b/tests/qmerge/packages/Packages index c03180c1..e6fa3a28 100644 --- a/tests/qmerge/packages/Packages +++ b/tests/qmerge/packages/Packages @@ -22,9 +22,9 @@ DESC: my desc EAPI: 4 KEYWORDS: ~amd64 ~x86 LICENSE: GPL-2 -MD5: 07aef33aaacf4aeccd012712aff93f19 +MD5: 6c6633c64b0666f04df62da2f8b30d32 MTIME: 1367290147 -SHA1: 38d8ababc531e2e12783326ef73f0771371ece93 -SIZE: 7264 +SHA1: 47f731ce30149f5ab15f0c47dc19b46e4b189d60 +SIZE: 7289 REPO: local diff --git a/tests/qmerge/packages/sys-devel/qmerge-test-1.3.tbz2 b/tests/qmerge/packages/sys-devel/qmerge-test-1.3.tbz2 Binary files differindex feeff2ef..24b6164c 100644 --- a/tests/qmerge/packages/sys-devel/qmerge-test-1.3.tbz2 +++ b/tests/qmerge/packages/sys-devel/qmerge-test-1.3.tbz2 |