CDRIVER-3422 remaining support of unified test format (#722)

Author: kevinAlbs

CONTRIBUTING.md

@@ -246,6 +246,12 @@ start mongocryptd on port 27020 and set the following:
 
 * `MONGOC_TEST_MONGOCRYPTD_BYPASS_SPAWN=on`
 
+Specification tests may be filtered by their description:
+
+* `MONGOC_JSON_SUBTEST=<string>`
+
+This can be useful in debugging a specific test case in a spec test file with multiple tests.
+
 All tests should pass before submitting a patch.
 
 ## Configuring the test runner

src/libmongoc/CMakeLists.txt

@@ -997,8 +997,11 @@ set (test-libmongoc-sources
    ${PROJECT_SOURCE_DIR}/tests/test-mongoc-write-commands.c
    ${PROJECT_SOURCE_DIR}/tests/test-mongoc-write-concern.c
    ${PROJECT_SOURCE_DIR}/tests/TestSuite.c
+   ${PROJECT_SOURCE_DIR}/tests/unified/operation.c
    ${PROJECT_SOURCE_DIR}/tests/unified/entity-map.c
+   ${PROJECT_SOURCE_DIR}/tests/unified/result.c
    ${PROJECT_SOURCE_DIR}/tests/unified/runner.c
+   ${PROJECT_SOURCE_DIR}/tests/unified/test-diagnostics.c
    ${PROJECT_SOURCE_DIR}/tests/unified/util.c
 )
 

src/libmongoc/tests/bsonutil/bson-match.c

@@ -305,7 +305,7 @@ bson_matcher_new ()
    bson_matcher_add_special (
       matcher, "$$unsetOrMatches", special_unset_or_matches, NULL);
    bson_matcher_add_special (
-      matcher, "$$matches_hex_bytes", special_matches_hex_bytes, NULL);
+      matcher, "$$matchesHexBytes", special_matches_hex_bytes, NULL);
    return matcher;
 }