summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-08-30 18:57:18 +0100
committerSam James <sam@gentoo.org>2022-08-30 18:57:18 +0100
commit77d62ff0066613f77ad14b2fb68a9bfbf2244321 (patch)
tree6eebd7beca8a2861d6489fa8df0a184c50d76787 /dev-lang/lua
parentdev-lang/lua: drop multilib remnants (diff)
downloadgentoo-77d62ff0066613f77ad14b2fb68a9bfbf2244321.tar.gz
gentoo-77d62ff0066613f77ad14b2fb68a9bfbf2244321.tar.bz2
gentoo-77d62ff0066613f77ad14b2fb68a9bfbf2244321.zip
dev-lang/lua: cleanup src_test
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/lua')
-rw-r--r--dev-lang/lua/lua-5.3.6-r5.ebuild13
-rw-r--r--dev-lang/lua/lua-5.4.4-r2.ebuild13
2 files changed, 6 insertions, 20 deletions
diff --git a/dev-lang/lua/lua-5.3.6-r5.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild
index b74e72009aa8..834187d40d16 100644
--- a/dev-lang/lua/lua-5.3.6-r5.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild
@@ -173,16 +173,9 @@ src_test() {
TEST_MARKER="${T}/test.failed"
rm -f "${TEST_MARKER}"
- # If we are failing, set the marker file, and only check it after done all ABIs
- abi_src_test() {
- debug-print-function ${FUNCNAME} "$@"
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
- return 0
- }
-
- foreach_abi abi_src_test
+ TEST_LOG="${T}/test.log"
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}"
if [ -e "${TEST_MARKER}" ]; then
cat "${TEST_MARKER}"
diff --git a/dev-lang/lua/lua-5.4.4-r2.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild
index 6cffda8c5a43..ce5679201998 100644
--- a/dev-lang/lua/lua-5.4.4-r2.ebuild
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild
@@ -170,16 +170,9 @@ src_test() {
TEST_MARKER="${T}/test.failed"
rm -f "${TEST_MARKER}"
- # If we are failing, set the marker file, and only check it after done all ABIs
- abi_src_test() {
- debug-print-function ${FUNCNAME} "$@"
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
- return 0
- }
-
- foreach_abi abi_src_test
+ TEST_LOG="${T}/test.log"
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}"
if [ -e "${TEST_MARKER}" ]; then
cat "${TEST_MARKER}"