summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-07-10 03:01:47 +0000
committerDavide Pesavento <pesa@gentoo.org>2015-07-10 03:01:47 +0000
commit7094516816615ff766d90c3e9b7246d98826a471 (patch)
treec02a736281198e24fab639ccc35406bf6e7f2d7e /dev-util/qbs
parentAutomated update. (diff)
downloadhistorical-7094516816615ff766d90c3e9b7246d98826a471.tar.gz
historical-7094516816615ff766d90c3e9b7246d98826a471.tar.bz2
historical-7094516816615ff766d90c3e9b7246d98826a471.zip
Enable more (all) unit tests. Use a custom test runner script that correctly sets LD_LIBRARY_PATH for each test binary.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-util/qbs')
-rw-r--r--dev-util/qbs/ChangeLog6
-rw-r--r--dev-util/qbs/Manifest32
-rw-r--r--dev-util/qbs/qbs-1.4.1.ebuild16
3 files changed, 35 insertions, 19 deletions
diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 759e228ef9af..e084c838fa96 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/qbs
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.18 2015/07/08 16:34:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.19 2015/07/10 03:01:36 pesa Exp $
+
+ 10 Jul 2015; Davide Pesavento <pesa@gentoo.org> qbs-1.4.1.ebuild:
+ Enable more (all) unit tests. Use a custom test runner script that correctly
+ sets LD_LIBRARY_PATH for each test binary.
*qbs-1.4.1 (08 Jul 2015)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 9e6dc3ea3eae..b5c7d9a8eaaf 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -2,25 +2,25 @@
Hash: SHA256
DIST qbs-src-1.4.1.tar.gz 802383 SHA256 eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2 WHIRLPOOL f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
-EBUILD qbs-1.4.1.ebuild 2076 SHA256 eda312ce0095fcfdd88a0802823dbb946aaabe3327941f4b11f39ca09d41bfa8 SHA512 2d63c26dee161b89653fe300e087a28f7adfd91a25f6f65ac617ab81d09d24fb9967f4cb91350bbd6b3171a46be29dfc813e9d13faf577d7667d443ecf8282c7 WHIRLPOOL bb6e8a24ffbde83da4fe9dbeae05d44a3ce90381af4557df07fc34dac941241c8779b0870bb70b4f3c1b8055d76e8ebd9b4199f5bb3a982a5f6fa70944bce6d8
-MISC ChangeLog 3252 SHA256 e2222ad6a3b1fd84571a01d4dad25634f508a981ea234a9359c6b872d4134bca SHA512 229e1b50993ba91a60efa299528f595f87167e26cc0b256c52f2deb2a80337def2902ace1f93ea7627f92988ad1b44542e513fe1792399d0b5e15f0e58b9c060 WHIRLPOOL 9b4e360c2f68d13b9dd62e1388c7cae0141d4d60030c2842cd4886ec40dfb439bab3ae7ca88409e1fcc2f792abc698eda037d9e13d43f95cb7826fcf8f56b5b9
+EBUILD qbs-1.4.1.ebuild 2466 SHA256 68a2879433140ee20c1168ff759e2c9ad939f425a881c1a5bb20ce4570f748d5 SHA512 e91af7c2d917c711c5827ab30d48844b442574feb177828ab8502759fb675430c0a36352772103075f38cc7eebba12e7175a6380fd550b24318deb48b8a172d9 WHIRLPOOL a3d6db2709f54a578c43500fb8b9f4dd460051e52a62d5236731e910147ad619925050618c21943f8c81a3cd2dd875cf597833a24fc5a5b64900b9fd665b5e46
+MISC ChangeLog 3445 SHA256 0d98ad28a296ea6d92039646c964707ed7f72ae525e77cd0aa92f8b0b7010236 SHA512 d4e66063b67cabfe975f16ec2f17520adf98d5cbb806ff5afb9a4c2e17d8cfa9f87c0e7edffce9cf486897549f979204619a5e8eb3a823ff121e20b0315e68b5 WHIRLPOOL 65a8d86612961047cf19d2a9c45c8f0b0bc4bbca3221f3192409fbdba70758b819ba4fd7b8c5aa09f0f2f4269dc2a49fcd451adf9931ab5209675dddc400a129
MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJVnVEvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVnzWSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV97c8P/idQ3RsYfi17TlSy0TwOZKMH
-JyDckoTUu3/Bgp7Ldd1/wxLE/Kgtb0cL0mY0wpNdXC83tvJ/LeN3aYYj1ej117oM
-PH5HcfjcWKyDErR67a+UvrgJ0mwkT+eVRxrcq72nAqL9wAg6Xm4VsDQYso7yUzzK
-yczMdh3byliKu9WqLgvStszl/t1S+LVLMkaaW+VV4naseYquGK+4yFeqnciGfz8h
-zq1Xt97fP/HGxj4YrPhjHHVTbodiy0TrzxHcgb8Wm54BeKkXMePCtYEue21F16Qn
-Kt9AC4dPxHWr8I2PA7+5tx3oVhMBjswdbXSBV5tgk7y/iEmmIRLZnu3f8W4DWhz+
-Ev4yoWGhGYWPI6Xl4Mqbc+ibBomGA0Keb181kHFN/xz+iTftiCcnfNnNbHdy+GzF
-+Y++rKm4MBq+pocYE9wCacBIQXzAOcVoFyyi31z//Mg54tfdTAMdKAg+P3XlS8Vl
-qvckUh8GY2h1ejPbxiQ+ZOYFs3ZJQMdmOUa+GxpUtrbKXaGkpAq+xoQk0YwZDTMP
-uDzxJ3ghaftN9cMl8NuVM0XfeZ8WCTS4AU5mCWyCIkrEThlZJCZwQtfO55HM6zcR
-sLb/+SKOzjWurN2ibSx/RcL3IF6iAwS3vd4/1uwGHdX4oN8reNr8gNrWDD7p/Una
-c+Rmrtv1FbwZyxsk/kZs
-=iqa9
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9NkcP/16FQKEX029yAIl3BEyJH7Qa
+lsT2xpwAaAxdii63N2/9QSJORWLGZ/C/x300zuVq9x87veao6q+NaYV66YQOdqUQ
+1ZdttgowbtcEz/L+yHLJB3SYp7gc4pevfsx3H2dQs835sA0/FcyoMqc6Jl6pEHtd
+VpbCznta8Y7zxNtPGkH/fMtCGZEIKZdSMlwCiYjuGtD5Av93JzB22SMD2u5bfiSm
+HIX+X/233bnxVe7wjFz7agNt9OdKJds9qmWNMVkv8b+FppzpAA0emWK/6/Z86ZYL
+Xxb3EZGSDSxufkN82KSDKVIuFjA5NkT2CejzZuQ2etP+cDFDsUH8/fAqetnEzbNe
+3hlR4f4h2g/6zX0HU0XQoUiBSpqIPrSdSPCMBmpRyXGOMgUOw/kpDn54tCPf9wHD
+Ptz8rjn/CmVUP63Rj0sRUdaJnSMrNn3EvNYy0uj8+qpTjzu7FeSTUMe+knZkXHQ2
+dPUDESGB8sD62aYDiFsRXzMRrqHwK3tIZCUESGNWNXpGPhB4yPt4hA6WC4CsmY0+
+rYd/DnD9V71+CC/on5eiH7o4dtnMLgpcOrseODFJicacdlch/Zf1Xf7yH76HB9RL
+PNIBTj8AaVf93f+/r5Z3VEpMSyYa8tvF5BEONdfGJ+r2JGdrPMWBTTKCJla15agn
+Ch9mkHPikGpOwCybNQzv
+=RZDv
-----END PGP SIGNATURE-----
diff --git a/dev-util/qbs/qbs-1.4.1.ebuild b/dev-util/qbs/qbs-1.4.1.ebuild
index 80dfb75a851a..c84babc396a1 100644
--- a/dev-util/qbs/qbs-1.4.1.ebuild
+++ b/dev-util/qbs/qbs-1.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild,v 1.1 2015/07/08 16:34:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild,v 1.2 2015/07/10 03:01:36 pesa Exp $
EAPI=5
@@ -59,6 +59,7 @@ src_configure() {
-recursive
CONFIG+=qbs_disable_rpath
CONFIG+=qbs_enable_project_file_updates
+ $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
QBS_INSTALL_PREFIX="${EPREFIX}/usr"
QBS_LIBRARY_DIRNAME="$(get_libdir)"
)
@@ -85,7 +86,18 @@ src_test() {
"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
einfo "Running autotests"
- default
+
+ # simply exporting LD_LIBRARY_PATH doesn't work
+ # we have to use a custom testrunner script
+ local testrunner=${S}/gentoo-testrunner
+ cat <<-EOF > "${testrunner}"
+ #!/bin/sh
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+ exec "\$@"
+ EOF
+ chmod +x "${testrunner}"
+
+ emake TESTRUNNER="'${testrunner}'" check
}
src_install() {