From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 1 Jul 2017 16:10:06 +0000 (+0200)
Subject: eclass/tests: Fix inheriting multiple eclasses
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=692442585cdb32cd8c59acab4289565614faf3b8;p=gentoo.git

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.
---

diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh
index 8141425a0dcb..d52cf3a2687b 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() { :; }