From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA1B9138334 for ; Mon, 24 Dec 2018 06:35:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B637E09C4; Mon, 24 Dec 2018 06:35:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 353FBE09C4 for ; Mon, 24 Dec 2018 06:35:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D389B335C36 for ; Mon, 24 Dec 2018 06:35:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E46394CD for ; Mon, 24 Dec 2018 06:35:21 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1545633310.0e54d903b2acb714017d1ee2b6ed2f59d2125f17.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/qt-creator-4.8.0.ebuild dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0e54d903b2acb714017d1ee2b6ed2f59d2125f17 X-VCS-Branch: master Date: Mon, 24 Dec 2018 06:35:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95bfc0ad-84f3-4d72-87a6-91108e409529 X-Archives-Hash: f4fe5c4d8c15bd206fae0e581a3d72f8 commit: 0e54d903b2acb714017d1ee2b6ed2f59d2125f17 Author: Davide Pesavento gentoo org> AuthorDate: Mon Dec 24 06:34:41 2018 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Dec 24 06:35:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e54d903 dev-qt/qt-creator: several test fixes Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 17 +++++++++-------- dev-qt/qt-creator/qt-creator-9999.ebuild | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild index e08af8921a1..207b4b6cbf8 100644 --- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild @@ -116,11 +116,15 @@ src_prepare() { sed -i -e '/glsl/d' src/libs/libs.pro || die fi if ! use lsp; then - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die + sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die fi if ! use modeling; then sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi + if ! use valgrind; then + sed -i -e '/valgrindfake/d' src/tools/tools.pro || die + sed -i -e '/valgrind/d' tests/auto/auto.pro || die + fi # automagic dep on qtwebengine if ! use webengine; then @@ -129,21 +133,18 @@ src_prepare() { # disable broken or unreliable tests sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/sdktool/ d' tests/auto/auto.pro || die - sed -i -e '/\(dumpers\|offsets\)\.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 '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die - sed -i -e 's/\//' tests/auto/valgrind/valgrind.pro || die + sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die + sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die # fix path to some clang headers - sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die + sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die # fix translations local lang languages= for lang in ${PLOCALES}; do use l10n_${lang} && languages+=" ${lang/-/_}" done - sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die # remove bundled botan rm -rf src/libs/3rdparty/botan || die diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index e08af8921a1..207b4b6cbf8 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -116,11 +116,15 @@ src_prepare() { sed -i -e '/glsl/d' src/libs/libs.pro || die fi if ! use lsp; then - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die + sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die fi if ! use modeling; then sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi + if ! use valgrind; then + sed -i -e '/valgrindfake/d' src/tools/tools.pro || die + sed -i -e '/valgrind/d' tests/auto/auto.pro || die + fi # automagic dep on qtwebengine if ! use webengine; then @@ -129,21 +133,18 @@ src_prepare() { # disable broken or unreliable tests sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/sdktool/ d' tests/auto/auto.pro || die - sed -i -e '/\(dumpers\|offsets\)\.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 '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die - sed -i -e 's/\//' tests/auto/valgrind/valgrind.pro || die + sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die + sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die # fix path to some clang headers - sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die + sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die # fix translations local lang languages= for lang in ${PLOCALES}; do use l10n_${lang} && languages+=" ${lang/-/_}" done - sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die # remove bundled botan rm -rf src/libs/3rdparty/botan || die