pesa 15/01/25 15:06:13
Modified: qt-creator-3.2.2.ebuild qt-creator-3.3.0.ebuild
ChangeLog
Log:
Use virtualx for tests (bug 511972). Disable a few broken test cases.
Simplify src_test.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.4 dev-qt/qt-creator/qt-creator-3.2.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?r1=1.3&r2=1.4
Index: qt-creator-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-creator-3.2.2.ebuild 18 Jan 2015 04:56:40 -0000 1.3
+++ qt-creator-3.2.2.ebuild 25 Jan 2015 15:06:13 -0000 1.4
@@ -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 @@
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 @@
>=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 @@
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 @@
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() {
1.2 dev-qt/qt-creator/qt-creator-3.3.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild?r1=1.1&r2=1.2
Index: qt-creator-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-creator-3.3.0.ebuild 18 Jan 2015 04:56:40 -0000 1.1
+++ qt-creator-3.3.0.ebuild 25 Jan 2015 15:06:13 -0000 1.2
@@ -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 @@
# 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 @@
>=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 @@
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 @@
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() {
1.38 dev-qt/qt-creator/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.38&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.38&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 18 Jan 2015 04:56:40 -0000 1.37
+++ ChangeLog 25 Jan 2015 15:06:13 -0000 1.38
@@ -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 <p...@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)
