commit: a421b23251a7e997a0f5bf99f9ac6ec346d694a8
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 01:15:32 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 01:15:32 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=a421b232
tests: qmerge: fix running in nocolor mode
---
tests/qmerge/dotest | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index fac6437..e5a9c23 100755
--- a/tests/qmerge/dotest
+++ b/tests/qmerge/dotest
@@ -29,7 +29,7 @@ tend $? "qmerge-test: [N] basic merge" || echo "${out}"
[[ ${out} != *"FAIL"* ]]
tend $? "qmerge-test: [N] FAIL messages" || echo "${out}"
-order=$(echo "${out}" | awk '$1 == ">>>" { printf "%s ", $NF }')
+order=$(echo "${out}" | awk '$1 == ">>>" && $2 ~ /^pkg_/ { printf "%s ", $NF
}')
[[ ${order} == "pkg_pretend pkg_setup pkg_preinst pkg_postinst " ]]
tend $? "qmerge-test: [N] pkg_* order of execution" || printf '%s\n'
"${order}" "${out}"
@@ -49,7 +49,7 @@ tend $? "qmerge-test: [R] re-emerge" || echo "${out}"
[[ -x ${ROOT}/usr/bin/qmerge-test ]]
tend $? "qmerge-test: [R] installed expected files" || treedir "${ROOT}"
-order=$(echo "${out}" | awk '$1 == ">>>" { printf "%s ", $NF }')
+order=$(echo "${out}" | awk '$1 == ">>>" && $2 ~ /^pkg_/ { printf "%s ", $NF
}')
[[ ${order} == "pkg_pretend pkg_setup pkg_preinst pkg_postinst pkg_prerm
pkg_postrm " ]]
tend $? "qmerge-test: [R] pkg_* order of execution" || printf '%s\n'
"${order}" "${out}"
