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 3E30B138334 for ; Thu, 2 Jan 2020 20:48:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75F4BE0A5C; Thu, 2 Jan 2020 20:48:24 +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 5DB26E0A5C for ; Thu, 2 Jan 2020 20:48:24 +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 6985B34DE24 for ; Thu, 2 Jan 2020 20:48:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D18AF17 for ; Thu, 2 Jan 2020 20:48:21 +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: <1577998074.b9051664bb3c37b2894d94cf655adfdae7862bf8.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: b9051664bb3c37b2894d94cf655adfdae7862bf8 X-VCS-Branch: master Date: Thu, 2 Jan 2020 20:48: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: 94d48738-24cf-4444-b6ae-07a614023fb4 X-Archives-Hash: 0f177b329f769605750899cfc8ff4ecd commit: b9051664bb3c37b2894d94cf655adfdae7862bf8 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 20:47:54 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 20:47:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b9051664 tests: workound env issue on Travis Signed-off-by: Fabian Groffen gentoo.org> tests/init.sh.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/init.sh.in b/tests/init.sh.in index 8f52086..c5cd8f3 100644 --- a/tests/init.sh.in +++ b/tests/init.sh.in @@ -31,8 +31,12 @@ export TZ='UTC 0' # create symlinks for applets q -i -q -# inject valgrind wrapper if necessary -if [[ -n ${Q_RUN_WITH_VALGRIND} ]] ; then +# inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu +# used by Travis segfaults on qmanifest, so disable there to be able to +# run the rest regularly +dovalgrind=${Q_RUN_WITH_VALGRIND} +[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind= +if [[ -n ${dovalgrind} ]] ; then chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind" for f in @abs_top_builddir@/q?* ; do [[ -L ${f} ]] || continue