commit: d51fed45a9067b4ee6c69dc148c61f894d8a6596
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 19:20:38 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 20:56:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51fed45
dev-lang/lua: bump to 5.2.4 and 5.3.5, re-add upstream testsuite
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Acked-By: Rafael Martins <rafaelmartins <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
dev-lang/lua/Manifest | 4 ++
dev-lang/lua/lua-5.1.5-r100.ebuild | 2 +-
dev-lang/lua/lua-5.1.5-r101.ebuild | 2 +-
dev-lang/lua/lua-5.1.5-r102.ebuild | 2 +-
dev-lang/lua/lua-5.1.5-r4.ebuild | 2 +-
dev-lang/lua/lua-5.2.3-r1.ebuild | 2 +-
dev-lang/lua/lua-5.2.3-r2.ebuild | 2 +-
dev-lang/lua/lua-5.2.3-r3.ebuild | 2 +-
dev-lang/lua/lua-5.2.3.ebuild | 2 +-
.../lua/{lua-5.2.3-r2.ebuild => lua-5.2.4.ebuild} | 49 ++++++++++++++++++----
dev-lang/lua/lua-5.3.3-r1.ebuild | 2 +-
dev-lang/lua/lua-5.3.3-r2.ebuild | 2 +-
dev-lang/lua/lua-5.3.3.ebuild | 2 +-
.../lua/{lua-5.3.3-r2.ebuild => lua-5.3.5.ebuild} | 43 +++++++++++++++++--
dev-lang/lua/metadata.xml | 5 ++-
15 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 98e8d86978e..1106de1d1a2 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,7 @@
DIST lua-5.1.5.tar.gz 221213 BLAKE2B
915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02
SHA512
0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
+DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B
323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae
SHA512
699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8
DIST lua-5.2.3.tar.gz 251195 BLAKE2B
f3d11e180fe070cb5be98f0694081d26067e21eddeb09cd74b1bae6ecf01c53dc46746b871e38555525da155bf1b83f0e60bae5387c2b96b1d19b15f94b716dc
SHA512
264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449
+DIST lua-5.2.4.tar.gz 252651 BLAKE2B
6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0
SHA512
cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
DIST lua-5.3.3.tar.gz 294290 BLAKE2B
8052d3fa5f34636df314886a62d63e46fc76ada765679da9352e751f484a458404ac55e5b32ad63ced9d2b16d629d62a52240b1b1a509bcdf5d5df85e405646d
SHA512
7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
+DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B
ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09
SHA512
79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
+DIST lua-5.3.5.tar.gz 303543 BLAKE2B
8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b
SHA512
4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild
b/dev-lang/lua/lua-5.1.5-r100.ebuild
index f532abb7f4f..2ea293401de 100644
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild
b/dev-lang/lua/lua-5.1.5-r101.ebuild
index 94a5f0a3080..b26dc779b90 100644
--- a/dev-lang/lua/lua-5.1.5-r101.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild
b/dev-lang/lua/lua-5.1.5-r102.ebuild
index cfd1cdfe50e..4849b6596ff 100644
--- a/dev-lang/lua/lua-5.1.5-r102.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 4917c1a9227..74650eb17ed 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
index 479f20de07d..e4c08ff092a 100644
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild
index 0021ce6efd5..24002f6d519 100644
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild
index 4096b356b1c..6e8d314636b 100644
--- a/dev-lang/lua/lua-5.2.3-r3.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild
index 30bfdb2bbb1..11bdc573aa1 100644
--- a/dev-lang/lua/lua-5.2.3.ebuild
+++ b/dev-lang/lua/lua-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.4.ebuild
similarity index 74%
copy from dev-lang/lua/lua-5.2.3-r2.ebuild
copy to dev-lang/lua/lua-5.2.4.ebuild
index 0021ce6efd5..a5e2cee1d0f 100644
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,12 +7,17 @@ inherit eutils autotools multilib multilib-minimal
portability toolchain-funcs v
DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
+TEST_PV="5.2.2" # no 5.2.3-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+ http://www.lua.org/ftp/${PKG_A}
+ test? ( https://www.lua.org/tests/${TEST_A} )"
LICENSE="MIT"
SLOT="5.2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated emacs readline static"
+IUSE="+deprecated emacs readline static test test-complete"
RDEPEND="readline? ( sys-libs/readline:0= )
app-eselect/eselect-lua
@@ -62,15 +67,15 @@ src_prepare() {
cp "${FILESDIR}/configure.in" "${S}"/ || die
eautoreconf
- # custom Makefiles
- multilib_copy_sources
-
# A slotted Lua uses different directories for headers & names for
# libraries, and pkgconfig should reflect that.
sed -r -i \
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
"${S}"/etc/lua.pc
+
+ # custom Makefiles
+ multilib_copy_sources
}
multilib_src_configure() {
@@ -140,4 +145,34 @@ multilib_src_install_all() {
# Makefile contains a dummy target that doesn't do tests
# but causes issues with slotted lua (bug #510360)
-src_test() { :; }
+src_test() {
+ debug-print-function ${FUNCNAME} "$@"
+ cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+ # https://www.lua.org/tests/
+ # There are two sets:
+ # basic
+ # complete.
+ #
+ # The basic subset is selected by passing -e'_U=true'
+ # The complete set is noted to contain tests that may consume too much
memory or have non-portable tests.
+ # attrib.lua for example needs some multilib customization (have to
compile the stuff in libs/ for each ABI)
+ use test-complete || TEST_OPTS="-e_U=true"
+ 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
+ }
+
+ multilib_foreach_abi abi_src_test
+
+ if [ -e "${TEST_MARKER}" ]; then
+ cat "${TEST_MARKER}"
+ die "Tests failed"
+ fi
+}
diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild
index 8addb54fd3e..0a325d68095 100644
--- a/dev-lang/lua/lua-5.3.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild
index b813a414cb9..61daaebe022 100644
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild
index 89fd40c75eb..234b85a128c 100644
--- a/dev-lang/lua/lua-5.3.3.ebuild
+++ b/dev-lang/lua/lua-5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.5.ebuild
similarity index 74%
copy from dev-lang/lua/lua-5.3.3-r2.ebuild
copy to dev-lang/lua/lua-5.3.5.ebuild
index b813a414cb9..99b6b206377 100644
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,12 +7,17 @@ inherit eutils autotools multilib multilib-minimal
portability toolchain-funcs v
DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
+TEST_PV="5.3.4" # no 5.3.5-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+ http://www.lua.org/ftp/${PKG_A}
+ test? ( https://www.lua.org/tests/${TEST_A} )"
LICENSE="MIT"
SLOT="5.3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated emacs readline static"
+IUSE="+deprecated emacs readline static test test-complete"
RDEPEND="readline? ( sys-libs/readline:0= )
app-eselect/eselect-lua
@@ -140,4 +145,34 @@ multilib_src_install_all() {
# Makefile contains a dummy target that doesn't do tests
# but causes issues with slotted lua (bug #510360)
-src_test() { :; }
+src_test() {
+ debug-print-function ${FUNCNAME} "$@"
+ cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+ # https://www.lua.org/tests/
+ # There are two sets:
+ # basic
+ # complete.
+ #
+ # The basic subset is selected by passing -e'_U=true'
+ # The complete set is noted to contain tests that may consume too much
memory or have non-portable tests.
+ # attrib.lua for example needs some multilib customization (have to
compile the stuff in libs/ for each ABI)
+ use test-complete || TEST_OPTS="-e_U=true"
+ 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
+ }
+
+ multilib_foreach_abi abi_src_test
+
+ if [ -e "${TEST_MARKER}" ]; then
+ cat "${TEST_MARKER}"
+ die "Tests failed"
+ fi
+}
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
index 0e7b568c389..06a68a0e049 100644
--- a/dev-lang/lua/metadata.xml
+++ b/dev-lang/lua/metadata.xml
@@ -9,5 +9,8 @@
<email>[email protected]</email>
<name>William Hubbs</name>
</maintainer>
-<use><flag name="deprecated">make deprecated data structures/routines
available</flag></use>
+<use>
+ <flag name="deprecated">make deprecated data structures/routines
available</flag>
+ <flag name="test-complete">Run the complete (non-portable)
testsuite</flag>
+</use>
</pkgmetadata>
