diff options
| author | Edward Thomson <ethomson@github.com> | 2016-04-06 15:59:31 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-04-06 15:59:31 -0400 |
| commit | 69723dd8d3b40f1e508d82ed0339839051abd19a (patch) | |
| tree | a813dbbaf7ccb4f2b08c9dc729832bf69d13d3a1 | |
| parent | 54cfee6d88d1710fcfedfa0d46aa34e4e883faee (diff) | |
| parent | 04f47a43f96664a23c992d1fcb2952f9fb78464c (diff) | |
| download | libgit2-69723dd8d3b40f1e508d82ed0339839051abd19a.tar.gz | |
Merge pull request #3730 from andhe/fix-stream-test
tests: fix core/stream test when built with openssl off
| -rw-r--r-- | tests/core/stream.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/core/stream.c b/tests/core/stream.c index ace6a05da..0cbf44230 100644 --- a/tests/core/stream.c +++ b/tests/core/stream.c @@ -33,8 +33,12 @@ void test_core_stream__register_tls(void) cl_git_pass(git_stream_register_tls(NULL)); error = git_tls_stream_new(&stream, "localhost", "443"); - /* We don't have arbitrary TLS stream support on Windows */ -#if GIT_WIN32 + /* We don't have arbitrary TLS stream support on Windows + * or when openssl support is disabled (except on OSX + * with Security framework). + */ +#if defined(GIT_WIN32) || \ + (!defined(GIT_SECURE_TRANSPORT) && !defined(GIT_OPENSSL)) cl_git_fail_with(-1, error); #else cl_git_pass(error); |