packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Conditionally build the GPG-related tests 

Do not build GPG signing/verification tests if `--without-gpgme`
option is used during configuration.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Closes: #1889
Approved by: cgwalters
This commit is contained in:
Denis Pynkin 2019-05-21 01:23:14 +03:00 committed by Atomic Bot
parent ca8752e01b
commit e187f240fc
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile-tests.am
View File

@ -68,7 +68,6 @@ _installed_or_uninstalled_test_scripts = \
tests/test-archivez.sh \ tests/test-archivez.sh \
tests/test-remote-add.sh \ tests/test-remote-add.sh \
tests/test-remote-headers.sh \ tests/test-remote-headers.sh \
tests/test-remote-gpg-import.sh \
tests/test-commit-sign.sh \ tests/test-commit-sign.sh \
tests/test-export.sh \ tests/test-export.sh \
tests/test-help.sh \ tests/test-help.sh \
@ -91,7 +90,6 @@ _installed_or_uninstalled_test_scripts = \
tests/test-pull-localcache.sh \ tests/test-pull-localcache.sh \
tests/test-local-pull.sh \ tests/test-local-pull.sh \
tests/test-local-pull-depth.sh \ tests/test-local-pull-depth.sh \
tests/test-gpg-signed-commit.sh \
tests/test-admin-upgrade-unconfigured.sh \ tests/test-admin-upgrade-unconfigured.sh \
tests/test-admin-upgrade-endoflife.sh \ tests/test-admin-upgrade-endoflife.sh \
tests/test-admin-upgrade-systemd-update.sh \ tests/test-admin-upgrade-systemd-update.sh \
@ -110,7 +108,6 @@ _installed_or_uninstalled_test_scripts = \
tests/test-admin-pull-deploy-split.sh \ tests/test-admin-pull-deploy-split.sh \
tests/test-admin-locking.sh \ tests/test-admin-locking.sh \
tests/test-admin-deploy-clean.sh \ tests/test-admin-deploy-clean.sh \
tests/test-admin-gpg.sh \
tests/test-reset-nonlinear.sh \ tests/test-reset-nonlinear.sh \
tests/test-oldstyle-partial.sh \ tests/test-oldstyle-partial.sh \
tests/test-delta.sh \ tests/test-delta.sh \
@ -139,6 +136,14 @@ _installed_or_uninstalled_test_scripts = \
tests/test-config.sh \ tests/test-config.sh \
$(NULL) $(NULL)
if USE_GPGME
_installed_or_uninstalled_test_scripts += \
tests/test-remote-gpg-import.sh \
tests/test-gpg-signed-commit.sh \
tests/test-admin-gpg.sh \
$(NULL)
endif
experimental_test_scripts = \ experimental_test_scripts = \
$(NULL) $(NULL)
test_extra_programs = \ test_extra_programs = \
@ -200,6 +205,7 @@ dist_test_extra_scripts = \
tests/ostree-grub-generator \ tests/ostree-grub-generator \
$(NULL) $(NULL)
if USE_GPGME
# We can't use nobase_ as we need to strip off the tests/, can't # We can't use nobase_ as we need to strip off the tests/, can't
# use plain installed_ as we do need the gpghome/ prefix. # use plain installed_ as we do need the gpghome/ prefix.
if ENABLE_INSTALLED_TESTS if ENABLE_INSTALLED_TESTS
@ -217,6 +223,7 @@ gpgvinsttestdir = $(installed_testdir)/gpg-verify-data
dist_gpgvinsttest_DATA = $(addprefix tests/gpg-verify-data/, \ dist_gpgvinsttest_DATA = $(addprefix tests/gpg-verify-data/, \
gpg.conf lgpl2 lgpl2.sig pubring.gpg secring.gpg trustdb.gpg) gpg.conf lgpl2 lgpl2.sig pubring.gpg secring.gpg trustdb.gpg)
endif endif
endif
js_installed_tests = \ js_installed_tests = \
tests/test-core.js \ tests/test-core.js \
@ -245,9 +252,15 @@ endif
_installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ tests/test-checksum tests/test-lzma tests/test-rollsum \
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h tests/test-kargs tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h tests/test-kargs
if USE_GPGME
_installed_or_uninstalled_test_programs += \
tests/test-gpg-verify-result \
$(NULL)
endif
if USE_AVAHI if USE_AVAHI
test_programs += tests/test-repo-finder-avahi test_programs += tests/test-repo-finder-avahi
endif endif
@ -354,16 +367,21 @@ tests_test_lzma_SOURCES = src/libostree/ostree-lzma-common.c src/libostree/ostre
tests_test_lzma_CFLAGS = $(TESTS_CFLAGS) $(OT_DEP_LZMA_CFLAGS) tests_test_lzma_CFLAGS = $(TESTS_CFLAGS) $(OT_DEP_LZMA_CFLAGS)
tests_test_lzma_LDADD = $(TESTS_LDADD) $(OT_DEP_LZMA_LIBS) tests_test_lzma_LDADD = $(TESTS_LDADD) $(OT_DEP_LZMA_LIBS)
if USE_GPGME
tests_test_gpg_verify_result_SOURCES = \ tests_test_gpg_verify_result_SOURCES = \
src/libostree/ostree-gpg-verify-result-private.h \ src/libostree/ostree-gpg-verify-result-private.h \
tests/test-gpg-verify-result.c tests/test-gpg-verify-result.c
tests_test_gpg_verify_result_CFLAGS = $(TESTS_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) tests_test_gpg_verify_result_CFLAGS = $(TESTS_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS)
tests_test_gpg_verify_result_LDADD = $(TESTS_LDADD) $(OT_INTERNAL_GPGME_LIBS) tests_test_gpg_verify_result_LDADD = $(TESTS_LDADD) $(OT_INTERNAL_GPGME_LIBS)
EXTRA_DIST += \
tests/gpg-verify-data/README.md \
$(NULL)
endif
EXTRA_DIST += \ EXTRA_DIST += \
tests/libostreetest.h \ tests/libostreetest.h \
tests/libtest.sh \ tests/libtest.sh \
tests/gpg-verify-data/README.md \
$(NULL) $(NULL)
tests/libreaddir-rand.so: Makefile tests/libreaddir-rand.so: Makefile