PROTON-1711: Make build/test work without any SSL implementation - Added missing stub function - Skip ssl test if there is no ssl impl.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b57acda8 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b57acda8 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b57acda8 Branch: refs/heads/go1 Commit: b57acda836c2cb91ad948171d3f5e117e3f67a06 Parents: 7c004d3 Author: Andrew Stitcher <[email protected]> Authored: Thu Dec 7 16:56:06 2017 -0500 Committer: Andrew Stitcher <[email protected]> Committed: Thu Dec 7 16:56:06 2017 -0500 ---------------------------------------------------------------------- proton-c/src/ssl/ssl_stub.c | 5 +++++ proton-c/src/tests/ssl.c | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b57acda8/proton-c/src/ssl/ssl_stub.c ---------------------------------------------------------------------- diff --git a/proton-c/src/ssl/ssl_stub.c b/proton-c/src/ssl/ssl_stub.c index 8607b88..0a6a13f 100644 --- a/proton-c/src/ssl/ssl_stub.c +++ b/proton-c/src/ssl/ssl_stub.c @@ -125,6 +125,11 @@ int pn_ssl_domain_set_ciphers(pn_ssl_domain_t *domain, const char *ciphers) return -1; } +int pn_ssl_domain_set_protocols(pn_ssl_domain_t* domain, const char* protocols) +{ + return -1; +} + bool pn_ssl_allow_unsecured(pn_ssl_t *ssl) { return true; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b57acda8/proton-c/src/tests/ssl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/tests/ssl.c b/proton-c/src/tests/ssl.c index 8b8616a..9acb362 100644 --- a/proton-c/src/tests/ssl.c +++ b/proton-c/src/tests/ssl.c @@ -59,6 +59,11 @@ static void test_ssl_protocols(test_t *t) int main(int argc, char **argv) { int failed = 0; + // Don't run these tests if ssl functionality wasn't compiled + if (!pn_ssl_present()) { + fprintf(stderr, "No SSL implementation to test\n"); + return failed; + } #if !defined(_WIN32) RUN_ARGV_TEST(failed, t, test_ssl_protocols(&t)); #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
