tests: only run gpgsign tests if gpg is present and executable

This allows the full test suite to run in Debian/Ubuntu autopkgtest with
only the Depends: installed, and nothing from Recommends:.
This commit is contained in:
Hans-Christoph Steiner 2018-06-22 10:11:16 +02:00
parent 95969b2891
commit a7bd3e01df
1 changed files with 2 additions and 2 deletions

View File

@ -262,7 +262,7 @@ grep -F '<application id=' repo/index.xml > /dev/null
grep -F '<install packageName=' repo/index.xml > /dev/null
grep -F '<uninstall packageName=' repo/index.xml > /dev/null
# OSX tests are run on Travis-CI, and gpg fails to launch gpg-agent there
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
if [ "$TRAVIS_OS_NAME" != "osx" ] && which gpg; then
$fdroid gpgsign --verbose
$fdroid gpgsign --verbose
test -e repo/obb.mainpatch.current_1619.apk.asc
@ -621,7 +621,7 @@ mkdir -p $LOCAL_COPY_DIR/repo
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
$fdroid checkupdates --allow-dirty
$fdroid gpgsign
which gpg && $fdroid gpgsign
$fdroid lint
$fdroid readmeta
$fdroid rewritemeta fake