remove scaffolding

Author: kevinAlbs

.evergreen/compile-unix.sh

@@ -261,9 +261,9 @@ if [ "$ANALYZE" != "ON" ]; then
 fi
 
 # We are done here if we don't want to run the tests.
-# if [ "$SKIP_MOCK_TESTS" = "ON" ]; then
-exit 0
-# fi
+if [ "$SKIP_MOCK_TESTS" = "ON" ]; then
+   exit 0
+fi
 
 if [ "$VALGRIND" = "ON" ]; then
    # Defines "run_valgrind" shell function.

.evergreen/compile-windows.sh

@@ -130,9 +130,9 @@ export MONGOC_TEST_SKIP_LIVE=on
 export MONGOC_TEST_SKIP_SLOW=on
 
 # We are done here if we don't want to run the tests.
-# if [ "$SKIP_MOCK_TESTS" = "ON" ]; then
-exit 0
-# fi
+if [ "$SKIP_MOCK_TESTS" = "ON" ]; then
+   exit 0
+fi
 
 export MONGOC_TEST_SERVER_LOG=stdout
 

.evergreen/run-tests.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 set -o errexit  # Exit the script with error if any of the commands fail
-set -o xtrace
 
 
 COMPRESSORS=${COMPRESSORS:-nocompressors}
@@ -119,9 +118,6 @@ check_mongocryptd() {
    fi
 }
 
-# TODO: run all tests.
-TEST_ARGS="$TEST_ARGS -l /client_side_encryption/*"
-
 export MONGOC_TEST_MONITORING_VERBOSE=on
 
 # Ensure mock KMS servers are running before starting tests.
@@ -176,7 +172,7 @@ case "$OS" in
       check_mongocryptd
 
       chmod +x src/libmongoc/Debug/test-libmongoc.exe
-      ./src/libmongoc/Debug/test-libmongoc.exe --no-fork $TEST_ARGS -d
+      ./src/libmongoc/Debug/test-libmongoc.exe $TEST_ARGS -d
       ;;
 
    *)

src/libmongoc/src/mongoc/mongoc-crypt.c

@@ -381,10 +381,6 @@ _state_need_mongo_keys (_state_machine_t *state_machine, bson_error_t *error)
    /* 2. Feed all resulting documents back (if any) with repeated calls to
     * mongocrypt_ctx_mongo_feed. */
    while (mongoc_cursor_next (cursor, &key_bson)) {
-      char *doc = bson_as_json (key_bson, NULL);
-      MONGOC_DEBUG ("_state_need_mongo_keys got document: %s", doc);
-      bson_free (doc);
-
       mongocrypt_binary_destroy (key_bin);
       key_bin = mongocrypt_binary_new_from_data (
          (uint8_t *) bson_get_data (key_bson), key_bson->len);
@@ -613,25 +609,6 @@ _state_ready (_state_machine_t *state_machine,
    return ret;
 }
 
-static const char *state_to_string (mongocrypt_ctx_state_t state) {
-   switch (state) {
-      case MONGOCRYPT_CTX_ERROR:
-      return "MONGOCRYPT_CTX_ERROR";
-      case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO:
-      return "MONGOCRYPT_CTX_NEED_MONGO_COLLINFO";
-      case MONGOCRYPT_CTX_NEED_MONGO_MARKINGS:
-      return "MONGOCRYPT_CTX_NEED_MONGO_MARKINGS";
-      case MONGOCRYPT_CTX_NEED_MONGO_KEYS:
-      return "MONGOCRYPT_CTX_NEED_MONGO_KEYS";
-      case MONGOCRYPT_CTX_NEED_KMS:
-      return "MONGOCRYPT_CTX_NEED_KMS";
-      case MONGOCRYPT_CTX_READY:
-      return "MONGOCRYPT_CTX_READY";
-      case MONGOCRYPT_CTX_DONE:
-      return "MONGOCRYPT_CTX_DONE";
-   }
-}
-
 /*--------------------------------------------------------------------------
  *
  * _mongoc_cse_run_state_machine --
@@ -654,7 +631,6 @@ _state_machine_run (_state_machine_t *state_machine,
 
    bson_init (result);
    while (true) {
-      MONGOC_DEBUG ("%s: state is %s\n", state_machine->db_name ? state_machine->db_name : "NULL", state_to_string (mongocrypt_ctx_state (state_machine->ctx)));
       switch (mongocrypt_ctx_state (state_machine->ctx)) {
       default:
       case MONGOCRYPT_CTX_ERROR:

src/libmongoc/src/mongoc/mongoc-log.c

@@ -104,7 +104,6 @@ mongoc_log (mongoc_log_level_t log_level,
    bson_mutex_unlock (&gLogMutex);
 
    bson_free (message);
-   fflush (stdout);
 }
 
 

src/libmongoc/tests/json-test-monitoring.c

@@ -153,7 +153,7 @@ succeeded_cb (const mongoc_apm_command_succeeded_t *event)
       char *reply_json;
 
       reply_json = bson_as_canonical_extended_json (event->reply, NULL);
-      MONGOC_DEBUG ("<-- %s COMMAND SUCCEEDED: %s\n", mongoc_apm_command_succeeded_get_command_name (event), reply_json);
+      MONGOC_DEBUG ("<-- COMMAND SUCCEEDED: %s\n", reply_json);
       bson_free (reply_json);
    }
 

src/libmongoc/tests/json-test-operations.c

@@ -958,10 +958,6 @@ single_write (mongoc_collection_t *collection,
       abort ();
    }
 
-   if (!r) {
-      MONGOC_DEBUG ("operation %s has error: %s", name, error.message);
-   }
-
    value_init_from_doc (&value, reply);
    check_result (test, operation, r, &value, &error);
    bson_value_destroy (&value);

src/libmongoc/tests/json-test.c

@@ -1708,8 +1708,6 @@ run_json_general_test (const json_test_config_t *config)
          continue;
       }
 
-      MONGOC_DEBUG ("running test: %s", description);
-
       if (bson_has_field (&test, "skipReason")) {
          fprintf (stderr,
                   " - %s SKIPPED, reason: %s\n",

src/libmongoc/tests/test-conveniences.c

@@ -121,7 +121,7 @@ tmp_bson (const char *json, ...)
       doc = bson_new_from_json ((const uint8_t *) double_quoted, -1, &error);
 
       if (!doc) {
-         fprintf (stderr, "%s\n", error.message);
+         fprintf (stderr, "%s: %s\n", error.message, json);
          abort ();
       }