| 1 |
commit: 77d62ff0066613f77ad14b2fb68a9bfbf2244321 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 17:57:18 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 17:57:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d62ff0 |
| 7 |
|
| 8 |
dev-lang/lua: cleanup src_test |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-lang/lua/lua-5.3.6-r5.ebuild | 13 +++---------- |
| 13 |
dev-lang/lua/lua-5.4.4-r2.ebuild | 13 +++---------- |
| 14 |
2 files changed, 6 insertions(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/lua/lua-5.3.6-r5.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild |
| 17 |
index b74e72009aa8..834187d40d16 100644 |
| 18 |
--- a/dev-lang/lua/lua-5.3.6-r5.ebuild |
| 19 |
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild |
| 20 |
@@ -173,16 +173,9 @@ src_test() { |
| 21 |
TEST_MARKER="${T}/test.failed" |
| 22 |
rm -f "${TEST_MARKER}" |
| 23 |
|
| 24 |
- # If we are failing, set the marker file, and only check it after done all ABIs |
| 25 |
- abi_src_test() { |
| 26 |
- debug-print-function ${FUNCNAME} "$@" |
| 27 |
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" |
| 28 |
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
| 29 |
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" |
| 30 |
- return 0 |
| 31 |
- } |
| 32 |
- |
| 33 |
- foreach_abi abi_src_test |
| 34 |
+ TEST_LOG="${T}/test.log" |
| 35 |
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
| 36 |
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}" |
| 37 |
|
| 38 |
if [ -e "${TEST_MARKER}" ]; then |
| 39 |
cat "${TEST_MARKER}" |
| 40 |
|
| 41 |
diff --git a/dev-lang/lua/lua-5.4.4-r2.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild |
| 42 |
index 6cffda8c5a43..ce5679201998 100644 |
| 43 |
--- a/dev-lang/lua/lua-5.4.4-r2.ebuild |
| 44 |
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild |
| 45 |
@@ -170,16 +170,9 @@ src_test() { |
| 46 |
TEST_MARKER="${T}/test.failed" |
| 47 |
rm -f "${TEST_MARKER}" |
| 48 |
|
| 49 |
- # If we are failing, set the marker file, and only check it after done all ABIs |
| 50 |
- abi_src_test() { |
| 51 |
- debug-print-function ${FUNCNAME} "$@" |
| 52 |
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" |
| 53 |
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
| 54 |
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" |
| 55 |
- return 0 |
| 56 |
- } |
| 57 |
- |
| 58 |
- foreach_abi abi_src_test |
| 59 |
+ TEST_LOG="${T}/test.log" |
| 60 |
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
| 61 |
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}" |
| 62 |
|
| 63 |
if [ -e "${TEST_MARKER}" ]; then |
| 64 |
cat "${TEST_MARKER}" |
Archives