summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-07-01 18:10:06 +0200
committerMichał Górny <mgorny@gentoo.org>2017-08-08 21:42:16 +0200
commit692442585cdb32cd8c59acab4289565614faf3b8 (patch)
tree4d91953279588d4556db72a3fd76215cac00e7d3 /eclass/tests
parentwww-client/chromium: dev channel bump (62.0.3175.4) (diff)
downloadgentoo-692442585cdb32cd8c59acab4289565614faf3b8.tar.gz
gentoo-692442585cdb32cd8c59acab4289565614faf3b8.tar.bz2
gentoo-692442585cdb32cd8c59acab4289565614faf3b8.zip
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.
Diffstat (limited to 'eclass/tests')
-rw-r--r--eclass/tests/tests-common.sh4
1 files changed, 2 insertions, 2 deletions
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() { :; }