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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0EAF15800A for ; Wed, 30 Aug 2023 06:33:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA3D52BC01F; Wed, 30 Aug 2023 06:33:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B51512BC01F for ; Wed, 30 Aug 2023 06:33:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBF66340BC9 for ; Wed, 30 Aug 2023 06:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23FDC10E7 for ; Wed, 30 Aug 2023 06:33:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1693377199.190ab28b73cc8f2e8f51fde63b494dd570f8cd2b.sam@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.19.1.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 190ab28b73cc8f2e8f51fde63b494dd570f8cd2b X-VCS-Branch: master Date: Wed, 30 Aug 2023 06:33:42 +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: 2754f1b4-41c8-430f-9372-6febe7604f13 X-Archives-Hash: 92f16267eb0f2816dde80470813f9d7f commit: 190ab28b73cc8f2e8f51fde63b494dd570f8cd2b Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 30 06:22:05 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 30 06:33:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190ab28b dev-util/qbs: remove comment inside substitution Signed-off-by: Arthur Zamarin gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/32525 Signed-off-by: Sam James gentoo.org> dev-util/qbs/qbs-1.19.1.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild index 3339bb574287..28e160fd13ed 100644 --- a/dev-util/qbs/qbs-1.19.1.ebuild +++ b/dev-util/qbs/qbs-1.19.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,11 +58,15 @@ src_prepare() { echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro # skip several tests that fail and/or have additional deps - sed -i \ - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ - -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 + local SKIP_TESTS_ARGS=( + # requires zip and jar + -e 's/findArchiver(binaryName,.*/"";/' + # requires nodejs, bug 527652 + -e 's/p\.value("nodejs\./true||&/' + # requires nodejs and typescript + -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' + ) + sed -i tests/auto/blackbox/tst_blackbox.cpp "${SKIP_TESTS_ARGS[@]}" || die sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die }