aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-05-25 18:57:38 +0200
committerFabian Groffen <grobian@gentoo.org>2019-05-25 18:57:38 +0200
commit5b2115597e4143cea0eef2aa7b3a062ddb122073 (patch)
tree2b2cb8a02d82673863fc2998c4adbb1072c5f032 /tests
parenttravis: perhaps getting gnupg2 helps (diff)
downloadportage-utils-5b2115597e4143cea0eef2aa7b3a062ddb122073.tar.gz
portage-utils-5b2115597e4143cea0eef2aa7b3a062ddb122073.tar.bz2
portage-utils-5b2115597e4143cea0eef2aa7b3a062ddb122073.zip
tests/qmanifest: give up on Travis
Debuntu is just toooooooo old. Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qmanifest/dotest15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 95871419..fcb5bf0f 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