| 1 |
commit: b9b22135a5095cbcc4c26dc9573a0e677f2637f5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 17 22:04:00 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 17 22:04:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tatt.git/commit/?id=b9b22135 |
| 7 |
|
| 8 |
tatt_functions.sh: avoid circular dependencies with USE="minimal -doc" |
| 9 |
|
| 10 |
Emerge test dependencies with USE="minimal -doc" first. This should avoid circular |
| 11 |
dependencies at least with a lot of dev-perl/* packages. |
| 12 |
|
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
templates/tatt_functions.sh | 5 +++++ |
| 16 |
1 file changed, 5 insertions(+) |
| 17 |
|
| 18 |
diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh |
| 19 |
index 0e95e9a..bd21e46 100644 |
| 20 |
--- a/templates/tatt_functions.sh |
| 21 |
+++ b/templates/tatt_functions.sh |
| 22 |
@@ -46,6 +46,11 @@ function tatt_test_pkg |
| 23 |
{ |
| 24 |
if [ "${1:?}" == "--test" ]; then |
| 25 |
shift |
| 26 |
+ |
| 27 |
+ # Do a first pass to avoid circular dependencies |
| 28 |
+ # --onlydeps should mean we're avoiding (too much) duplicate work |
| 29 |
+ USE="minimal -doc" emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}" |
| 30 |
+ |
| 31 |
if ! emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"; then |
| 32 |
echo "merging test dependencies of ${1} failed" >> "${TATT_REPORTFILE}" |
| 33 |
return 1 |
Archives