From fee1094301b048955161d29312987292434c248b Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Mon, 11 Apr 2016 10:04:25 +0200 Subject: [PATCH] Add git_tests-fix-core-stream-test-when-built-with-openssl-o.patch --- ...tream-test-when-built-with-openssl-o.patch | 41 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 debian/patches/git_tests-fix-core-stream-test-when-built-with-openssl-o.patch diff --git a/debian/patches/git_tests-fix-core-stream-test-when-built-with-openssl-o.patch b/debian/patches/git_tests-fix-core-stream-test-when-built-with-openssl-o.patch new file mode 100644 index 000000000..cf2bc0c6b --- /dev/null +++ b/debian/patches/git_tests-fix-core-stream-test-when-built-with-openssl-o.patch @@ -0,0 +1,41 @@ +From 060c81a6d299c7c459cf62c194675892bacf9dd3 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Wed, 6 Apr 2016 10:37:30 +0200 +Subject: [PATCH] tests: fix core/stream test when built with openssl off + +When passing -DUSE_OPENSSL:BOOL=OFF to cmake the testsuite will +fail with the following error: + +core::stream::register_tls [/tmp/libgit2/tests/core/stream.c:40] + Function call failed: (error) + error -1 - + +Fix test to assume failure for tls when built without openssl. +While at it also fix GIT_WIN32 cpp to check if it's defined +or not. +--- + tests/core/stream.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/core/stream.c b/tests/core/stream.c +index ace6a05..0cbf442 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); +-- +2.8.0.rc3 + diff --git a/debian/patches/series b/debian/patches/series index cdacb994b..4bd443ddf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ disable_tests.patch +git_tests-fix-core-stream-test-when-built-with-openssl-o.patch