devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow running tests when static library is disabled

Browse Source 
We then only run a subset of the tests, but still better than failing to
build.

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2023-08-09 13:34:18 +02:00
parent f13ea6e556
commit 9eba8e8738
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/main.yml vendored
View File

@@ -24,6 +24,7 @@ jobs:
- { configure: '--disable-tls' } - { configure: '--disable-tls' }
- { configure: '--enable-cares' } - { configure: '--enable-cares' }
- { configure: '--disable-getrandom' } - { configure: '--disable-getrandom' }
- { configure: '--disable-static' }
name: Regular Tests name: Regular Tests
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

22
Makefile.am
View File

@@ -175,23 +175,29 @@ endif
## Tests ## Tests
TESTS = \ STATIC_TESTS = \
tests/check_parser \ tests/check_parser \
tests/test_hash \
tests/test_jid \
tests/test_ctx \
tests/test_send_queue \
tests/test_string \
tests/test_resolver
TESTS = \
tests/test_sha1 \ tests/test_sha1 \
tests/test_sha256 \ tests/test_sha256 \
tests/test_sha512 \ tests/test_sha512 \
tests/test_md5 \ tests/test_md5 \
tests/test_rand \ tests/test_rand \
tests/test_scram \ tests/test_scram \
tests/test_ctx \
tests/test_base64 \ tests/test_base64 \
tests/test_hash \
tests/test_jid \
tests/test_send_queue \
tests/test_snprintf \ tests/test_snprintf \
tests/test_string \ tests/test_stanza
tests/test_stanza \
tests/test_resolver if !DISABLE_STATIC
TESTS += $(STATIC_TESTS)
endif
if !DISABLE_TLS if !DISABLE_TLS
TESTS += tests/test_xmppaddr TESTS += tests/test_xmppaddr

1
configure.ac
View File

@@ -256,6 +256,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2]) AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno]) AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno])
AM_CONDITIONAL([DISABLE_STATIC], [test x$enable_static = xno])
AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno]) AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno])
AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes]) AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes])
AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes]) AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes])