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 71BB2138334 for ; Sat, 25 May 2019 16:58:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76677E0821; Sat, 25 May 2019 16:58:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 58905E0821 for ; Sat, 25 May 2019 16:58:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E19CE344FE1 for ; Sat, 25 May 2019 16:58:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE2B3452 for ; Sat, 25 May 2019 16:58:51 +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: <1558803458.5b2115597e4143cea0eef2aa7b3a062ddb122073.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/ X-VCS-Repository: proj/portage-utils X-VCS-Files: tests/qmanifest/dotest X-VCS-Directories: tests/qmanifest/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5b2115597e4143cea0eef2aa7b3a062ddb122073 X-VCS-Branch: master Date: Sat, 25 May 2019 16:58:51 +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: c9d3062c-067a-4c04-b206-54fdfff4e8cb X-Archives-Hash: 1f5aa5fac7eac9b0d5bb62bd6bcfee99 commit: 5b2115597e4143cea0eef2aa7b3a062ddb122073 Author: Fabian Groffen gentoo org> AuthorDate: Sat May 25 16:57:38 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat May 25 16:57:38 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5b211559 tests/qmanifest: give up on Travis Debuntu is just toooooooo old. Signed-off-by: Fabian Groffen gentoo.org> tests/qmanifest/dotest | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest index 9587141..fcb5bf0 100755 --- a/tests/qmanifest/dotest +++ b/tests/qmanifest/dotest @@ -42,6 +42,10 @@ test 04 1 "qmanifest -d not_a_tree" # overlay test test 05 1 "qmanifest -o notatree" +# Travis uses old Ubuntu, and Ubuntu uses prehistoric gpg, which just +# won't work. Too bad, really. +if [[ ${TRAVIS_OS_NAME} != Linux ]] ; then + # generate a valid tree rm -Rf testtree cp -r "${ROOT}/simpletree" testtree || echo try it anyway @@ -58,16 +62,11 @@ gpg_import() { --quiet --no-tty --passphrase-fd 0 + --pinentry-mode loopback --import "${key}" ) - local killpinentry="--pinentry-mode loopback" - # see if gpg is new enough for killpinentry - if echo "${pass}" | gpg -n ${killpinentry} "${args[@]}" ; then - echo "${pass}" | gpg ${killpinentry} "${args[@]}" - else - echo "${pass}" | gpg "${args[@]}" - fi + echo "${pass}" | gpg "${args[@]}" } # import key gpg_import "${as}"/key.gpg qmanifest @@ -90,6 +89,8 @@ test 07 0 "qmanifest testtree | sed -e '/Manifest timestamp/d' -e 's/made .* UTC gpgconf --kill all rm -Rf "${HOME}" +fi # TRAVIS_OS_NAME==Linux + cleantmpdir end