[patch] meson-fix-tests.patch

meson-fix-tests.patch (text/plain), 924 bytes, created by William Hubbs on 2019-03-30 19:48:50 UTC

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 65b09932a7a..751d4a35be3 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -78,6 +78,12 @@ fi
 # Optional meson arguments as Bash array; this should be defined before
 # calling meson_src_configure.
 
+# @VARIABLE: emesontestargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Optional "meson test" arguments as Bash array; this should be defined before
+# calling meson_src_test.
+
 
 read -d '' __MESON_ARRAY_PARSER <<"EOF"
 import shlex
@@ -251,7 +257,16 @@ meson_src_compile() {
 meson_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	eninja -C "${BUILD_DIR}" test
+	local mesontestargs=(
+		--verbose
+		-C "${BUILD_DIR}"
+		)
+
+	# Append additional arguments from ebuild
+	mesontestargs+=("${emesontestargs[@]}")
+
+	echo meson test ${mesontestargs[@]}
+	meson test ${mesontestargs[@]} || die "tests failed"
 }
 
 # @FUNCTION: meson_src_install