Merge pull request libgit2#3494 from leoyanggit/fix_unit_test_build

carlosmn · carlosmn · commit 3ce6cd4bdc6e · 2015-11-03T08:13:41.000-08:00
Fix build for unit test
diff --git a/tests/online/badssl.c b/tests/online/badssl.c
@@ -5,23 +5,34 @@
 static git_repository *g_repo;
 
 #if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
+static bool g_has_ssl = true;
+#else
+static bool g_has_ssl = false;
+#endif
 
 void test_online_badssl__expired(void)
 {
+	if (!g_has_ssl)
+		cl_skip();
+
 	cl_git_fail_with(GIT_ECERTIFICATE,
 			 git_clone(&g_repo, "https://expired.badssl.com/fake.git", "./fake", NULL));
 }
 
 void test_online_badssl__wrong_host(void)
 {
+	if (!g_has_ssl)
+		cl_skip();
+
 	cl_git_fail_with(GIT_ECERTIFICATE,
 			 git_clone(&g_repo, "https://wrong.host.badssl.com/fake.git", "./fake", NULL));
 }
 
 void test_online_badssl__self_signed(void)
 {
+	if (!g_has_ssl)
+		cl_skip();
+
 	cl_git_fail_with(GIT_ECERTIFICATE,
 			 git_clone(&g_repo, "https://self-signed.badssl.com/fake.git", "./fake", NULL));
 }
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,34 @@`
`5`	`5`	`static git_repository *g_repo;`
`6`	`6`
`7`	`7`	`#if defined(GIT_OPENSSL) \|\| defined(GIT_WINHTTP) \|\| defined(GIT_SECURE_TRANSPORT)`
	`8`	`+static bool g_has_ssl = true;`
	`9`	`+#else`
	`10`	`+static bool g_has_ssl = false;`
	`11`	`+#endif`
`8`	`12`
`9`	`13`	`void test_online_badssl__expired(void)`
`10`	`14`	`{`
	`15`	`+ if (!g_has_ssl)`
	`16`	`+ cl_skip();`
	`17`	`+`
`11`	`18`	`cl_git_fail_with(GIT_ECERTIFICATE,`
`12`	`19`	`git_clone(&g_repo, "https://expired.badssl.com/fake.git", "./fake", NULL));`
`13`	`20`	`}`
`14`	`21`
`15`	`22`	`void test_online_badssl__wrong_host(void)`
`16`	`23`	`{`
	`24`	`+ if (!g_has_ssl)`
	`25`	`+ cl_skip();`
	`26`	`+`
`17`	`27`	`cl_git_fail_with(GIT_ECERTIFICATE,`
`18`	`28`	`git_clone(&g_repo, "https://wrong.host.badssl.com/fake.git", "./fake", NULL));`
`19`	`29`	`}`
`20`	`30`
`21`	`31`	`void test_online_badssl__self_signed(void)`
`22`	`32`	`{`
	`33`	`+ if (!g_has_ssl)`
	`34`	`+ cl_skip();`
	`35`	`+`
`23`	`36`	`cl_git_fail_with(GIT_ECERTIFICATE,`
`24`	`37`	`git_clone(&g_repo, "https://self-signed.badssl.com/fake.git", "./fake", NULL));`
`25`	`38`	`}`
`26`		`-`
`27`		`-#endif`