From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 13FD913829C for ; Fri, 10 Jun 2016 00:54:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 519FD254025; Fri, 10 Jun 2016 00:54:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A5C5254025 for ; Fri, 10 Jun 2016 00:54:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08E8A340C36 for ; Fri, 10 Jun 2016 00:54:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE85D13FE for ; Fri, 10 Jun 2016 00:54:44 +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: <1465520061.af8bbe837be84424051c66815370eb411ba231c4.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/qbs/qbs-1.4.5.ebuild dev-util/qbs/qbs-1.5.0.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: af8bbe837be84424051c66815370eb411ba231c4 X-VCS-Branch: master Date: Fri, 10 Jun 2016 00:54:44 +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-Archives-Salt: b634a11a-1e1f-4a0d-94b4-6c76d665b3d3 X-Archives-Hash: 616f93dd456f4fbaa536e766ba854bb9 commit: af8bbe837be84424051c66815370eb411ba231c4 Author: Davide Pesavento gentoo org> AuthorDate: Fri Jun 10 00:36:34 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Jun 10 00:54:21 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8bbe83 dev-util/qbs: make sure we skip all tests that have automagic deps ...to avoid spurious failures. Gentoo-Bug: 585398 Package-Manager: portage-2.3.0_rc1 dev-util/qbs/qbs-1.4.5.ebuild | 18 ++++++++++++------ dev-util/qbs/qbs-1.5.0.ebuild | 13 ++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild index bdbca00..f789f54 100644 --- a/dev-util/qbs/qbs-1.4.5.ebuild +++ b/dev-util/qbs/qbs-1.4.5.ebuild @@ -40,10 +40,6 @@ S=${WORKDIR}/${MY_P} src_prepare() { default - # disable tests that require nodejs (bug 527652) - sed -i -e 's/!haveNodeJs()/true/' \ - tests/auto/blackbox/tst_blackbox.cpp || die - if ! use examples; then sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die fi @@ -53,6 +49,16 @@ src_prepare() { else sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die fi + + # skip several tests that fail and/or have additional deps + sed -i \ + -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ + -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ + -e 's/p\.value("java\./true||&/' `# requires jdk, fails, bug 585398` \ + -e 's/!haveMakeNsis/true/' `# requires nsis` \ + -e 's/!haveWiX(profile)/true/' `# requires wix` \ + -e 's/!haveNodeJs()/true/' `# requires nodejs, bug 527652` \ + tests/auto/blackbox/tst_blackbox.cpp || die } src_configure() { @@ -74,14 +80,14 @@ src_test() { export HOME=${T} export LD_LIBRARY_PATH=${S}/$(get_libdir) - "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die + "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die einfo "Running autotests" # simply exporting LD_LIBRARY_PATH doesn't work # we have to use a custom testrunner script - local testrunner=${S}/gentoo-testrunner + local testrunner=${WORKDIR}/gentoo-testrunner cat <<-EOF > "${testrunner}" #!/bin/sh export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" diff --git a/dev-util/qbs/qbs-1.5.0.ebuild b/dev-util/qbs/qbs-1.5.0.ebuild index 9913d03..0f9c5e4 100644 --- a/dev-util/qbs/qbs-1.5.0.ebuild +++ b/dev-util/qbs/qbs-1.5.0.ebuild @@ -50,6 +50,17 @@ src_prepare() { else sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die fi + + # skip several tests that fail and/or have additional deps + sed -i \ + -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ + -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ + -e 's/p\.value("java\./true||&/' `# requires jdk, fails, bug 585398` \ + -e 's/!haveMakeNsis/true/' `# requires nsis` \ + -e 's/!haveWiX(profile)/true/' `# requires wix` \ + -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ + -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ + tests/auto/blackbox/tst_blackbox.cpp || die } src_configure() { @@ -78,7 +89,7 @@ src_test() { # simply exporting LD_LIBRARY_PATH doesn't work # we have to use a custom testrunner script - local testrunner=${S}/gentoo-testrunner + local testrunner=${WORKDIR}/gentoo-testrunner cat <<-EOF > "${testrunner}" #!/bin/sh export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"