[gentoo-commits] repo/gentoo:master commit in: eclass/tests/

[Michał Górny]

commit:     692442585cdb32cd8c59acab4289565614faf3b8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  1 16:10:06 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 19:42:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69244258

eclass/tests: Fix inheriting multiple eclasses

Fix the inherit function to correctly handle 'inherit' call with
multiple eclasses, instead of returning after the first eclass is
successfully sourced.

 eclass/tests/tests-common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh
index 8141425a0dc..d52cf3a2687 100644
--- a/eclass/tests/tests-common.sh
+++ b/eclass/tests/tests-common.sh
@@ -17,11 +17,11 @@ inherit() {
                        local eclass=${path}/${e}.eclass
                        if [[ -e "${eclass}" ]] ; then
                                source "${eclass}"
-                               return 0
+                               continue 2
                        fi
                done
+               die "could not find ${e}.eclass"
        done
-       die "could not find ${eclass}"
 }
 EXPORT_FUNCTIONS() { :; }