Commit 08c1b8fc by Etienne Samson

cmake: simplify some HTTPS tests

parent 8f05d2d8
...@@ -52,7 +52,7 @@ IF (MSVC_IDE) ...@@ -52,7 +52,7 @@ IF (MSVC_IDE)
SET_SOURCE_FILES_PROPERTIES("precompiled.c" COMPILE_FLAGS "/Ycprecompiled.h") SET_SOURCE_FILES_PROPERTIES("precompiled.c" COMPILE_FLAGS "/Ycprecompiled.h")
ENDIF () ENDIF ()
IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND) IF (GIT_HTTPS)
ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -ionline -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style) ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -ionline -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style)
ELSE () ELSE ()
ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -v -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style) ADD_TEST(libgit2_clar "${libgit2_BINARY_DIR}/libgit2_clar" -v -xclone::local::git_style_unc_paths -xclone::local::standard_unc_paths_are_written_git_style)
......
...@@ -37,8 +37,7 @@ void test_core_stream__register_tls(void) ...@@ -37,8 +37,7 @@ void test_core_stream__register_tls(void)
* or when openssl support is disabled (except on OSX * or when openssl support is disabled (except on OSX
* with Security framework). * with Security framework).
*/ */
#if defined(GIT_WIN32) || \ #if defined(GIT_WIN32) || !defined(GIT_HTTPS)
(!defined(GIT_SECURE_TRANSPORT) && !defined(GIT_OPENSSL))
cl_git_fail_with(-1, error); cl_git_fail_with(-1, error);
#else #else
cl_git_pass(error); cl_git_pass(error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment