CDRIVER-643: Fix ‘test_mongoc_tls_hangup’ defined but not used

bjori · bjori · commit 38ae108cdac2 · 2015-12-04T11:12:08.000-08:00
diff --git a/tests/test-mongoc-stream-tls-error.c b/tests/test-mongoc-stream-tls-error.c
@@ -96,6 +96,11 @@ ssl_error_server (void *ptr)
    return NULL;
 }
 
+
+#define TRUST_DIR "tests/trust_dir"
+#define PEMFILE_NOPASS TRUST_DIR "/keys/mongodb.com.pem"
+
+#if !defined(__sun)
 /** run as a child thread by test_mongoc_tls_hangup
  *
  * It:
@@ -165,9 +170,6 @@ ssl_hangup_client (void *ptr)
    return NULL;
 }
 
-#define TRUST_DIR "tests/trust_dir"
-#define PEMFILE_NOPASS TRUST_DIR "/keys/mongodb.com.pem"
-
 static void
 test_mongoc_tls_hangup (void)
 {
@@ -210,6 +212,7 @@ test_mongoc_tls_hangup (void)
    ASSERT (cr.result == SSL_TEST_SUCCESS);
    ASSERT (sr.result == SSL_TEST_SUCCESS);
 }
+#endif
 
 
 /** run as a child thread by test_mongoc_tls_handshake_stall

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,11 @@ ssl_error_server (void *ptr)`
`96`	`96`	`return NULL;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+`
	`100`	`+#define TRUST_DIR "tests/trust_dir"`
	`101`	`+#define PEMFILE_NOPASS TRUST_DIR "/keys/mongodb.com.pem"`
	`102`	`+`
	`103`	`+#if !defined(__sun)`
`99`	`104`	`/** run as a child thread by test_mongoc_tls_hangup`
`100`	`105`	`*`
`101`	`106`	`* It:`
`@@ -165,9 +170,6 @@ ssl_hangup_client (void *ptr)`
`165`	`170`	`return NULL;`
`166`	`171`	`}`
`167`	`172`
`168`		`-#define TRUST_DIR "tests/trust_dir"`
`169`		`-#define PEMFILE_NOPASS TRUST_DIR "/keys/mongodb.com.pem"`
`170`		`-`
`171`	`173`	`static void`
`172`	`174`	`test_mongoc_tls_hangup (void)`
`173`	`175`	`{`
`@@ -210,6 +212,7 @@ test_mongoc_tls_hangup (void)`
`210`	`212`	`ASSERT (cr.result == SSL_TEST_SUCCESS);`
`211`	`213`	`ASSERT (sr.result == SSL_TEST_SUCCESS);`
`212`	`214`	`}`
	`215`	`+#endif`
`213`	`216`
`214`	`217`
`215`	`218`	`/** run as a child thread by test_mongoc_tls_handshake_stall`