default_src_test: handle EAPI 4 emake failure

This will fix bug #353897.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index a8ed745915e651b0c943012db7ed6be371f5025f..ebe2c65d3bc41cbb99858ecd478835b101b3a10b 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -626,15 +626,21 @@ _eapi0_src_compile() {
 }
 
 _eapi0_src_test() {
-       if emake -j1 check -n &> /dev/null; then
+       # Since we don't want emake's automatic die
+       # support (EAPI 4 and later), and we also don't
+       # want the warning messages that it produces if
+       # we call it in 'nonfatal' mode, we use emake_cmd
+       # to emulate the desired parts of emake behavior.
+       local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+       if $emake_cmd -j1 check -n &> /dev/null; then
                vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-               if ! emake -j1 check; then
+               if ! $emake_cmd -j1 check; then
                        hasq test $FEATURES && die "Make check failed. See above for details."
                        hasq test $FEATURES || eerror "Make check failed. See above for details."
                fi
-       elif emake -j1 test -n &> /dev/null; then
+       elif $emake_cmd -j1 test -n &> /dev/null; then
                vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-               if ! emake -j1 test; then
+               if ! $emake_cmd -j1 test; then
                        hasq test $FEATURES && die "Make test failed. See above for details."
                        hasq test $FEATURES || eerror "Make test failed. See above for details."
                fi