Use virtualx for tests (bug 511972). Disable a few broken test cases. Simplify src_test.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 53 insertions, 53 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index f82b77a0391d..bbb9d2edfc21 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.37 2015/01/18 04:56:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.38 2015/01/25 15:06:13 pesa Exp $
+
+  25 Jan 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.2.ebuild,
+  qt-creator-3.3.0.ebuild:
+  Use virtualx for tests (bug 511972). Disable a few broken test cases. Simplify
+  src_test.
 
 *qt-creator-3.3.0 (18 Jan 2015)
 
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 83248063e2a0..66e95027527a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -5,26 +5,26 @@ DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb
 DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.3.0.tar.gz 22950004 SHA256 27a5c8815fab95f959134047f8315686de4de6f99b0bedfd46b5dedae390525a SHA512 ec198c74fcfba06a4c8deaf3ff6d6d43617ee0a21118c189ac67bf99b46f78b19f5f09649e8376bad35695dd2ae66e2c47e1476381b2b3ea658fa9d433fc0ec6 WHIRLPOOL cb85fd5d1a235b885b4168db7da238175e1446d4b82e88ceabf107772ea32278475e3a50d61c5ce734080b0d5f00274317de6ac94d6700928f06725b143dc13f
 EBUILD qt-creator-2.8.1.ebuild 3181 SHA256 78cc78fe877d48e2bea5d3f262fd2fa1b7edb23c6914075d70efff99e398fdcb SHA512 f4cd8d08f25978d7a5aadd14742c63fb2e9091e2586dcc74fb5f373d7ba60d5c0e5c8ec98574c9ebf7476d0297c81fb3524dbe3749edcfe97714f44ec959d72b WHIRLPOOL 211a543227e30a1c18230b22941a68182e619f2284b2be51487cdbe0545be4b82bffa473c1e048d80d75b05185ba99e78f3ae526f529da7239d480432e2335cd
-EBUILD qt-creator-3.2.2.ebuild 3395 SHA256 c694aac11a3008017ebde2ab6c39cd725fb45bf172092a475e4387c1eaeef22c SHA512 12d73a29d2da5eb36634b4ad28471792d56ed0855dc828e84059290aebb68a3e92c3d361a18a1f995a2a1f2bfc3c0fc4ff03e1f77ebe184b22f0101f8694ea40 WHIRLPOOL af74a0be0af1325461b4563ee7cdd9e3ef9bb654841287d93fec88734a914ea1f129d0da5c18bf75caf5f1a42e0020c53ed3ba9c9017d570462e16f7bed61a05
-EBUILD qt-creator-3.3.0.ebuild 3817 SHA256 b89c8780ab4fbb7dd32dce1e6b19196a0cbbdef8bf9d122d1846ee691409ad35 SHA512 d6e5d6cd8ddc83a93f5cb504588dcfd46b17f98a8a1ed62be481c4ef78aa392d31cdbcff4f9fa63a04f3016ceb5a93676571993b7850d81865c347193974a646 WHIRLPOOL 214410b8532bb4a80afd9451b25c4ed24712eaa65c233db9262699634b7e29354b3df0a877a643b658a3c9b265c7b2e3e134fe88540c514dc7995292f7c3b06c
-MISC ChangeLog 27288 SHA256 85fb3fa9b915d179dc931066f2791f748749501bec3d9419b7eda46ec66d9787 SHA512 c181a45211efb7faad5bca8bc6646fac43205a051f0dcb851fbe92fbc14b53fca707215560637a3ff8b6787da780158da44f82d6abc63f624312e1bcb331087a WHIRLPOOL eaec7fc1c82f0d33122e29bcf59a19cfe6a144b1f3c7c829e39075e38fa4b6ffcaaa937b4ac3a9d04208dbd25f5d201462db55c5579a53c391f231100282fb62
+EBUILD qt-creator-3.2.2.ebuild 3549 SHA256 b89b97bd7dad17db1a38a3bad25d93739084223aa0e80bb80463ef5dc4c35fe6 SHA512 713d7bac98b06c219aa16c59632d9044b955fdeac523525f09cd3fb49f228e042192eb1df1a87506f8f9469f257095e529f956c0555a9e3b4bd730be18cacada WHIRLPOOL 7a9c1c2faa1ff7b400ec1d5a707e41f8ad5bdd2b3ce00a4b63d55abe85580f7d86a6a8c0d5057451e7efd0e862c6df97806fc00fb2c7ffc8fe895927e682bcbd
+EBUILD qt-creator-3.3.0.ebuild 4104 SHA256 d5ca79367719729bd8d45cf925db34cb01e0284b94d577ee56b7b006e2dc2ab6 SHA512 fb29dbeaa65b80b316d5afd15654b16f73f7fcfadc61a30d34ffced1b07cc657e42f6c7154d8e8eeaed9679fdb571018f4085fea661c51064db447b95c42c4d5 WHIRLPOOL 5a7bd88eaa93803c2e4d7ebb289c86c77dbbcf8a50d65257763bf77a21e07b79eed9deb085fcaf4ca95ccaf89108c786c882666f7192c1873755ebbc1c2ad096
+MISC ChangeLog 27484 SHA256 b16c7ee27eeeb7b17b5eaf88ec8b1c5d0e0344ba2c2f577428ed41d83d316a65 SHA512 b3657ffa4ebc4d27e300fe6d6d811c2886e0f4a78bad6b51326315eb489202cc888cff2bbadc12f37a7ec2f217440b24559559421278175c92e4a3afd061de2f WHIRLPOOL 4377b75e53252770a06b894c86b66911b27395d88f07cebedd736dee154998339b7f94133e1e56dc3fb13768856c73f17386576534c4c13211717c9ec6f6fdde
 MISC metadata.xml 1740 SHA256 27a5ef83ec012f02ad59acad3b950125fdcbf8a78ad82451f9d2b5dbf15a1f49 SHA512 6a8240c28f73c0a4138b82145ad38364962b2f0fce9563dc24ba2126c98ee03ea45677fc99d89bbfd71333e9c95440aae701a39089596f773e9a36b79d6063df WHIRLPOOL 3d4299284425bf2fc593293f0c70dd949b58e68ef83b480974bf0e2ba36a790486ec138d006b98fb455761d2be7313f8b7230739526fe5f9a4ad63486cbf2df1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUuz0RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUxQZtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9KIMQAK4Yji3y29uhmJi6OHiXmBLq
-f/CtNeRAQrpQcR7+adT6Vci3tv1T4TnBccrX+lsHFu2cYmmivsGFjjHd8wYsJjpq
-CvHMUUboHss4LM8n2O17A7XdNaA+eIkXBX2/GTQIVzDQ/PsEQg5BPbMEL1oGzLT3
-rzoRGW3gbmp5XEi4zG0bWze/Wposq2xMM16fGg/WLqjUisQgXS5sdeGzkrAskVaR
-VHXHRrB2FBFeuPOwbvVEYC7zE6tNphTrZR0q/g/JAnXSc40zfZesgFj0eS8KgW2J
-3w+IvXq8FBY+ek0r6fX2eF1v2+4iEtzHNaJodECNfAEKt/gg60mCJ9Iz8WQexDz+
-tHAaeyNO+w4UUxu/xWhIPT9l6XLADhijSgELzXor7jRo0irCcDTRaitLi21LP9Vn
-w/A4cW6Tzrh3hhODvB8s5Y1DntFelOOtf8yXVOygTJbHGL+weoBHOfGl0cJDewvO
-yZUVV8FGRX266t+v3MTq7lfImv8teIKzCrP9wdMht42kMsyPdT8687XviU9aFWAq
-5q/zu73HiJEq4Y8SfXkk6HzgiCej2DDiH0ECIaojb0hvDaDUaJ6hvEwVMd6OxXiO
-d930BxdQktEZi9Xt3NeGb7Ksjcglo1lSYerCnOhMK+smo+v8htEeD4wO9yqowzaX
-K+JokGEeULt19kbApAJL
-=rZ+4
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV94UAP/1TONC6F2DuO+V1uEkS40ldQ
+SGGKOdKYc6V9OBAPcmjm9UVdp1tZ+KyrxckzilzdRxZIqM599KkiHHOB/bzlBefM
+JiL9JjU9IgsOo21/vVIEx0wy6IwR9H+IigJm+DBqA7vLDQv6QLsegDyizvQTgENs
+StypYAIh+pXTmqXLynNvOtt1DsZNrlZP0qvlAandaP16zdk/Y9NHrtLjhDiHdeEl
+BtyFV2UuxoCT/yPqWy1UCFUH5IUgxOgFHBxFTLtROFd0b6xyCd3yFw7OLAVbqp8Z
+cmPoJKEUBgnGLEUKN+DP+6s3OjcdpwU4qDRhQENZ6Gh55cKBJHVngMQqf3W21QeA
+ZLfOAYXQBMdhzkI13hicjsNxBznJObKhIsiOvMhrdqY4Ze6enfZsvytYiVBER1z1
+TTb5lrb2i6blH1HEWpn/EPCohR3Q2c81mbC/nIAfzUAZnU/1JxE0jEWNDcYBlGQT
+NjuYxEuwyjw9JtxfczUqXkdCYCN5NW31Oosl4cfVCCeUuKl2j/bi4dqq86VZ4GPF
+VNUD/SC5dR0MDU7HLYQ55QHLnCBK1mcIZ4J1pl7s968oH/z4x/8VMGe/uP6jbuz0
+hyiOMDAqsDRb2v5er5h13uv/VPApNa4z9Jfx1luyUVOPw63uhsOiqqfaHyKeiHKx
+ECgnAo6yW4OwkpCwOchn
+=L8m3
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
index e51ec1269224..7b2d642bd24c 100644
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.3 2015/01/18 04:56:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.4 2015/01/25 15:06:13 pesa Exp $
 
 EAPI=5
 
 PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
 
-inherit eutils l10n multilib qmake-utils
+inherit eutils l10n multilib qmake-utils virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
@@ -29,16 +29,15 @@ fi
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
-# TODO: qbs:qbsprojectmanager, winrt (both require qt5)
 QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
 	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
 	ios mercurial perforce python:pythoneditor qnx subversion valgrind)
-IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="4.8.5:4"
 
-CDEPEND="
+RDEPEND="
 	=dev-libs/botan-1.10*[threads]
 	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}[ssl]
@@ -48,16 +47,13 @@ CDEPEND="
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
 	>=dev-qt/qtsvg-${QT_PV}[accessibility]
+	>=sys-devel/gdb-7.4[client(+),python]
 	clang? ( >=sys-devel/clang-3.2:= )
 "
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
-RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[client(+),python]
-	examples? ( >=dev-qt/qtdemo-${QT_PV} )
-"
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
@@ -74,12 +70,17 @@ src_prepare() {
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then
 			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin#*:}\>/d" \
-				src/plugins/plugins.pro \
-				|| die "failed to disable ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
 
+	# disable broken or unreliable tests
+	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
+	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+
 	# fix translations
 	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
 		share/qtcreator/translations/translations.pro || die
@@ -94,18 +95,13 @@ src_configure() {
 	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
 		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		TEST=$(use test && echo 1 || echo 0) \
+		$(use test && echo BUILD_TESTS=1) \
 		USE_SYSTEM_BOTAN=1
 }
 
 src_test() {
-	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
 	cd tests/auto || die
-
-	EQMAKE4_EXCLUDE="valgrind/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
-
-	default
+	VIRTUALX_COMMAND=default virtualmake
 }
 
 src_install() {
diff --git a/dev-qt/qt-creator/qt-creator-3.3.0.ebuild b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
index 40044fff9bea..e6d54123cb70 100644
--- a/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.1 2015/01/18 04:56:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.2 2015/01/25 15:06:13 pesa Exp $
 
 EAPI=5
 
 PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
 
-inherit eutils l10n multilib qmake-utils
+inherit eutils l10n multilib qmake-utils virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
@@ -37,7 +37,7 @@ IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
 # minimum Qt version required
 QT_PV="5.3.2:5"
 
-CDEPEND="
+RDEPEND="
 	=dev-libs/botan-1.10*[threads]
 	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtconcurrent-${QT_PV}
@@ -55,18 +55,16 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
+	>=sys-devel/gdb-7.4[client(+),python]
 	clang? ( >=sys-devel/clang-3.2:= )
 	qbs? ( >=dev-util/qbs-1.3.3[qt5] )
 "
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
-RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[client(+),python]
-"
 for x in ${PLOCALES}; do
 	# qt translations must be installed for qt-creator translations to work
 	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
@@ -90,11 +88,16 @@ src_prepare() {
 		if ! use ${plugin%:*}; then
 			einfo "Disabling ${plugin%:*} plugin"
 			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro \
-				|| die "failed to disable ${plugin%:*} plugin"
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
 
+	# disable broken or unreliable tests
+	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
+	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+
 	# fix translations
 	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
 		share/qtcreator/translations/translations.pro || die
@@ -108,17 +111,13 @@ src_configure() {
 		IDE_PACKAGE_MODE=1 \
 		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
 		QBS_INSTALL_DIR="${EPREFIX}/usr" \
-		TEST=$(use test && echo 1 || echo 0) \
+		$(use test && echo BUILD_TESTS=1) \
 		USE_SYSTEM_BOTAN=1
 }
 
 src_test() {
-	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
 	cd tests/auto || die
-
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)"
-
-	default
+	VIRTUALX_COMMAND=default virtualmake
 }
 
 src_install() {