CDRIVER-4151 Replace static TestFnCtx with allocated object (#865)

Author: eramongodb

src/libmongoc/tests/TestSuite.c

@@ -364,6 +364,17 @@ _TestSuite_AddFull (TestSuite *suite,  /* IN */
 }
 
 
+void
+_TestSuite_TestFnCtxDtor (void *ctx)
+{
+   TestFuncDtor dtor = ((TestFnCtx *) ctx)->dtor;
+   if (dtor) {
+      dtor (ctx);
+   }
+   free (ctx);
+}
+
+
 #if defined(_WIN32)
 static void
 _print_getlasterror_win (const char *msg)
@@ -873,8 +884,7 @@ test_matches (TestSuite *suite, Test *test)
    }
 
    for (i = 0; i < suite->match_patterns.len; i++) {
-      char *pattern =
-         _mongoc_array_index (&suite->match_patterns, char *, i);
+      char *pattern = _mongoc_array_index (&suite->match_patterns, char *, i);
       if (TestSuite_TestMatchesName (suite, test, pattern)) {
          return true;
       }

src/libmongoc/tests/TestSuite.h

@@ -674,6 +674,7 @@ struct _TestSuite {
 
 struct _TestFnCtx {
    TestFunc test_fn;
+   TestFuncDtor dtor;
 };
 
 
@@ -714,15 +715,23 @@ _TestSuite_AddFull (TestSuite *suite,
                     TestFuncDtor dtor,
                     void *ctx,
                     ...);
+void
+_TestSuite_TestFnCtxDtor (void *ctx);
 #define TestSuite_AddFull(_suite, _name, _func, _dtor, _ctx, ...) \
    _TestSuite_AddFull (_suite, _name, _func, _dtor, _ctx, __VA_ARGS__, NULL)
-#define TestSuite_AddFullWithTestFn(                            \
-   _suite, _name, _func, _dtor, _test_fn, ...)                  \
-   do {                                                         \
-      static TestFnCtx ctx;                                     \
-      ctx.test_fn = (TestFunc) (_test_fn);                      \
-      _TestSuite_AddFull (                                      \
-         _suite, _name, _func, _dtor, &ctx, __VA_ARGS__, NULL); \
+#define TestSuite_AddFullWithTestFn(                \
+   _suite, _name, _func, _dtor, _test_fn, ...)      \
+   do {                                             \
+      TestFnCtx *ctx = malloc (sizeof (TestFnCtx)); \
+      ctx->test_fn = (TestFunc) (_test_fn);         \
+      ctx->dtor = _dtor;                            \
+      _TestSuite_AddFull (_suite,                   \
+                          _name,                    \
+                          _func,                    \
+                          _TestSuite_TestFnCtxDtor, \
+                          ctx,                      \
+                          __VA_ARGS__,              \
+                          NULL);                    \
    } while (0)
 int
 TestSuite_Run (TestSuite *suite);