commit: 27fedebe2364719287d421a0d961980e6766879b
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Dec 2 10:06:56 2024 +0000
Commit: Nicolas PARLANT <ppn <AT> parhuet <DOT> fr>
CommitDate: Mon Dec 2 10:09:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27fedebe
dev-lua/cqueues: add tests
patch for 5.4
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
dev-lua/cqueues/cqueues-20200726.ebuild | 41 +++++++++++--
.../cqueues/files/cqueues-20200726-5-4_tests.patch | 68 ++++++++++++++++++++++
2 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/dev-lua/cqueues/cqueues-20200726.ebuild
b/dev-lua/cqueues/cqueues-20200726.ebuild
index 5bce52a20..d6caa4f84 100644
--- a/dev-lua/cqueues/cqueues-20200726.ebuild
+++ b/dev-lua/cqueues/cqueues-20200726.ebuild
@@ -21,9 +21,6 @@ IUSE="examples"
REQUIRED_USE="${LUA_REQUIRED_USE}"
-# tests with starttls are buggy
-RESTRICT="test"
-
DEPEND="
${LUA_DEPS}
dev-libs/openssl:0=
@@ -33,7 +30,7 @@ BDEPEND="virtual/pkgconfig"
DOCS=( "doc/." )
-# Thanks to dev-lua/luaossl for workarounds
+PATCHES="${FILESDIR}/cqueues-20200726-5-4_tests.patch"
src_prepare() {
default
@@ -43,6 +40,14 @@ src_prepare() {
-e '/LUAPATH_FN =/d' \
-i GNUmakefile || die
+ # tests deleted :
+ # 22, 73, 87 = weak/old ssl
+ # 30 = call google.com
+ rm regress/22-client-dtls.lua \
+ regress/73-starttls-buffering.lua \
+ regress/87-alpn-disappears.lua \
+ regress/30-starttls-completion.lua || die
+
lua_copy_sources
}
@@ -52,6 +57,7 @@ lua_src_compile() {
if [[ ${ELUA} != luajit ]]; then
LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
else
+ # Thanks to dev-lua/luaossl for this workaround
# This is a workaround for luajit, as it confirms to lua5.1
# and the 'GNUmakefile' doesn't understand LuaJITs version.
LUA_VERSION="5.1"
@@ -71,14 +77,37 @@ src_compile() {
lua_foreach_impl lua_src_compile
}
+lua_src_test() {
+ pushd "${BUILD_DIR}" || die
+
+ if [[ ${ELUA} != luajit ]]; then
+ LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
+ # these two tests are forced upstream for luajit only
+ rm
"${BUILD_DIR}"/regress/{44-resolvers-gc,51-join-defunct-thread}.lua || die
+ else
+ LUA_VERSION="5.1"
+ fi
+
+ if [[ ${ELUA} != lua5.3 ]]; then
+ # this test is forced upstream for lua5-3 only
+ rm "${BUILD_DIR}"/regress/152-thread-integer-passing.lua || die
+ fi
+
+ default
+
+ popd
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
lua_src_install() {
pushd "${BUILD_DIR}" || die
if [[ ${ELUA} != luajit ]]; then
LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
else
- # This is a workaround for luajit, as it confirms to lua5.1
- # and the 'GNUmakefile' doesn't understand LuaJITs version.
LUA_VERSION="5.1"
fi
diff --git a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
new file mode 100644
index 000000000..92c2bb944
--- /dev/null
+++ b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
@@ -0,0 +1,68 @@
+From ef7c2b2547fc3e1d26bc1d423edc2792a8056649 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <[email protected]>
+Date: Mon, 2 Dec 2024 09:14:19 +0000
+Subject: [PATCH] add 5.4
+
+---
+ regress/GNUmakefile | 2 +-
+ regress/regress.sh | 10 ++++++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/regress/GNUmakefile b/regress/GNUmakefile
+index 70c8dfe..fb9cd5a 100644
+--- a/regress/GNUmakefile
++++ b/regress/GNUmakefile
+@@ -12,7 +12,7 @@ include $(d)/../GNUmakefile
+ .PHONY: $(d)/check check
+
+ $(d)/check:
+- @for V in 5.1 5.2 5.3; do \
++ @for V in 5.1 5.2 5.3 5.4; do \
+ printf "Building $${V}... "; \
+ if (cd $(@D) && ./regress.sh -r"$${V}" build >/dev/null 2>&1);
then \
+ printf "OK\n"; \
+diff --git a/regress/regress.sh b/regress/regress.sh
+index ae55657..862f1c9 100755
+--- a/regress/regress.sh
++++ b/regress/regress.sh
+@@ -70,6 +70,8 @@ lua52path="${CQUEUES_SRCDIR}/regress/.local/share/5.2"
+ lua52cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.2"
+ lua53path="${CQUEUES_SRCDIR}/regress/.local/share/5.3"
+ lua53cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.3"
++lua54path="${CQUEUES_SRCDIR}/regress/.local/share/5.4"
++lua54cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.4"
+
+ export
LUA_PATH="${lua51path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH:-;}"
+ export LUA_CPATH="${lua51cpath}/?.so;${LUA_CPATH:-;}"
+@@ -77,6 +79,8 @@ export
LUA_PATH_5_2="${lua52path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PA
+ export LUA_CPATH_5_2="${lua52cpath}/?.so;${LUA_CPATH_5_2:-;}"
+ export
LUA_PATH_5_3="${lua53path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_3:-;}"
+ export LUA_CPATH_5_3="${lua53cpath}/?.so;${LUA_CPATH_5_3:-;}"
++export
LUA_PATH_5_4="${lua54path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_4:-;}"
++export LUA_CPATH_5_4="${lua54cpath}/?.so;${LUA_CPATH_5_4:-;}"
+
+
+ if [ "${0##*/}" = "regress.sh" ]; then
+@@ -87,7 +91,8 @@ if [ "${0##*/}" = "regress.sh" ]; then
+ (cd "${CQUEUES_SRCDIR}" && make -s "install${LUA_API}" \
+ lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
+ lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
+- lua53path="${lua53path}" lua53cpath="${lua53cpath}")
++ lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
++ lua54path="${lua54path}" lua54cpath="${lua54cpath}")
+ exit $?
+ ;;
+ *)
+@@ -102,7 +107,8 @@ else
+ (cd "${CQUEUES_SRCDIR}" && make -s install \
+ lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
+ lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
+- lua53path="${lua53path}" lua53cpath="${lua53cpath}")
++ lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
++ lua54path="${lua54path}" lua54cpath="${lua54cpath}")
+ fi
+
+ if [ ! -d "${CQUEUES_SRCDIR}/regress/.local/lib/5.3" ] || ! runlua -e
'require"_cqueues"' >>/dev/null 2>&1; then
+--
+2.45.2
+
