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 5ED90158087 for ; Sun, 6 Feb 2022 15:32:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 940732BC024; Sun, 6 Feb 2022 15:32:21 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 808B52BC024 for ; Sun, 6 Feb 2022 15:32:21 +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 B0AB3342D5A for ; Sun, 6 Feb 2022 15:32:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BB782AF for ; Sun, 6 Feb 2022 15:32:19 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1644161535.d57f8516cfad348c7871ebeee81b11ef6fcf4acf.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/ X-VCS-Repository: proj/portage-utils X-VCS-Files: tests/init.sh.in X-VCS-Directories: tests/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d57f8516cfad348c7871ebeee81b11ef6fcf4acf X-VCS-Branch: master Date: Sun, 6 Feb 2022 15:32:19 +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: 1ab78b21-fd9a-4e95-8574-ff537a4afc36 X-Archives-Hash: 8d1af98842e25f8a1c9edac63a9e070c commit: d57f8516cfad348c7871ebeee81b11ef6fcf4acf Author: Fabian Groffen gentoo org> AuthorDate: Sun Feb 6 15:32:15 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Feb 6 15:32:15 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d57f8516 tests/init: remove last Travis cruft Signed-off-by: Fabian Groffen gentoo.org> tests/init.sh.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/init.sh.in b/tests/init.sh.in index 248e343..2b0a65f 100644 --- a/tests/init.sh.in +++ b/tests/init.sh.in @@ -32,12 +32,9 @@ export TZ='UTC 0' q -i -q # inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu -# used by Travis segfaults on qmanifest and qcheck, so disable there to -# be able to run the rest regularly +# causes qmanifest to print stuff double, so skip it for that applet dovalgrind=${Q_RUN_WITH_VALGRIND} -[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind= -[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind= -[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmerge ]] && dovalgrind= +[[ ${RUNNER_OS}:${as##*/} == Linux:qmanifest ]] && dovalgrind= if [[ -n ${dovalgrind} ]] ; then chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind" for f in @abs_top_builddir@/q?* ; do