Compile out unused functions using TODO flags rather then comments

Author: bjori

tests/TestSuite.c

@@ -667,10 +667,6 @@ TestSuite_RunSerial (TestSuite *suite) /* IN */
 }
 
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomment"
-#endif
 static void
 TestSuite_RunNamed (TestSuite *suite,     /* IN */
                     const char *testname) /* IN */
@@ -692,7 +688,7 @@ TestSuite_RunNamed (TestSuite *suite,     /* IN */
                 suite->name, test->name);
       name [sizeof name - 1] = '\0';
       if (star) {
-         /* e.g. testname is "/Client/*" and name is "/Client/authenticate" */
+         /* e.g. testname is "/Client*" and name is "/Client/authenticate" */
          match = (0 == strncmp (name, testname, strlen (testname) - 1));
       } else {
          match = (0 == strcmp (name, testname));
@@ -710,9 +706,6 @@ TestSuite_RunNamed (TestSuite *suite,     /* IN */
 
    Mutex_Destroy (&mutex);
 }
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
 
 
 int

tests/test-bulk.c

@@ -1623,6 +1623,7 @@ _test_write_concern (bool has_write_commands, bool ordered)
    mock_server_destroy (mock_server);
 }
 
+#ifdef TODO_CDRIVER_707
 static void
 test_write_concern_legacy_ordered (void)
 {
@@ -1635,6 +1636,7 @@ test_write_concern_legacy_unordered (void)
 {
    _test_write_concern (false, false);
 }
+#endif
 
 
 static void
@@ -2250,12 +2252,12 @@ test_bulk_install (TestSuite *suite)
                   test_single_unordered_bulk);
    TestSuite_Add (suite, "/BulkOperation/single_error_unordered_bulk",
                   test_single_error_unordered_bulk);
-/* TODO: CDRIVER-707.
+#ifdef TODO_CDRIVER_707
    TestSuite_Add (suite, "/BulkOperation/write_concern/legacy/ordered",
                   test_write_concern_legacy_ordered);
    TestSuite_Add (suite, "/BulkOperation/write_concern/legacy/unordered",
                   test_write_concern_legacy_unordered);
-*/
+#endif
    TestSuite_Add (suite, "/BulkOperation/write_concern/write_command/ordered",
                   test_write_concern_write_command_ordered);
    TestSuite_Add (suite, "/BulkOperation/write_concern/write_command/unordered",

tests/test-mongoc-client.c

@@ -210,6 +210,7 @@ test_mongoc_client_authenticate_failure (void *context)
 }
 
 
+#ifdef TODO_CDRIVER_689
 static void
 test_wire_version (void)
 {
@@ -257,6 +258,7 @@ test_wire_version (void)
    mongoc_client_destroy (client);
    mock_server_destroy (server);
 }
+#endif
 
 
 static void
@@ -699,6 +701,8 @@ test_client_install (TestSuite *suite)
    TestSuite_Add (suite, "/Client/server_status", test_server_status);
    TestSuite_Add (suite, "/Client/database_names", test_get_database_names);
 
-   /* TODO: CDRIVER-689 */
-   /*TestSuite_Add (suite, "/Client/wire_version", test_wire_version);*/
+#ifdef TODO_CDRIVER_689
+   TestSuite_Add (suite, "/Client/wire_version", test_wire_version);
+#endif
 }
+

tests/test-mongoc-cursor.c

@@ -222,6 +222,7 @@ test_kill_cursors_pooled (void)
 }
 
 
+#ifdef TODO_CDRIVER_679
 static void
 _test_getmore_fail (bool has_primary,
                     bool pooled)
@@ -328,6 +329,7 @@ test_getmore_fail_no_primary_single (void)
 {
    _test_getmore_fail (false, false);
 }
+#endif
 
 
 void
@@ -338,7 +340,7 @@ test_cursor_install (TestSuite *suite)
    TestSuite_Add (suite, "/Cursor/invalid_query", test_invalid_query);
    TestSuite_Add (suite, "/Cursor/kill/single", test_kill_cursors_single);
    TestSuite_Add (suite, "/Cursor/kill/pooled", test_kill_cursors_pooled);
-   /* TODO: CDRIVER-679
+#ifdef TODO_CDRIVER_679
    TestSuite_Add (suite, "/Cursor/getmore_fail/with_primary/pooled",
                   test_getmore_fail_with_primary_pooled);
    TestSuite_Add (suite, "/Cursor/getmore_fail/with_primary/single",
@@ -347,4 +349,5 @@ test_cursor_install (TestSuite *suite)
                   test_getmore_fail_no_primary_pooled);
    TestSuite_Add (suite, "/Cursor/getmore_fail/no_primary/single",
                   test_getmore_fail_no_primary_single);*/
+#endif
 }

tests/test-mongoc-stream-tls-error.c

@@ -221,6 +221,7 @@ test_mongoc_tls_hangup (void)
  *    5. confirms that it times out
  *    6. shuts down
  */
+#ifdef TODO_CDRIVER_630
 static void *
 handshake_stall_client (void *ptr)
 {
@@ -316,6 +317,7 @@ test_mongoc_tls_handshake_stall (void)
    ASSERT (cr.result == SSL_TEST_SUCCESS);
    ASSERT (sr.result == SSL_TEST_SUCCESS);
 }
+#endif
 
 void
 test_stream_tls_error_install (TestSuite *suite)
@@ -325,9 +327,8 @@ test_stream_tls_error_install (TestSuite *suite)
    TestSuite_Add (suite, "/TLS/hangup", test_mongoc_tls_hangup);
 #endif
 
-   /* TODO: CDRIVER-630 */
-/*
+#ifdef TODO_CDRIVER_630
    TestSuite_Add (suite, "/TLS/handshake_stall",
                   test_mongoc_tls_handshake_stall);
-*/
+#endif
 }