Merging upstream version 1.60.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 45 deletions

diff --git a/tests/failmalloc.c b/tests/failmalloc.c
index 6294cff..b491deb 100644
--- a/tests/failmalloc.c
+++ b/tests/failmalloc.c
@@ -26,54 +26,20 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <stdio.h>
-#include <string.h>
-#include <CUnit/Basic.h>
+#include "munit.h"
+
 /* include test cases' include files here */
 
 #include "failmalloc_test.h"
 
-static int init_suite1(void) { return 0; }
-
-static int clean_suite1(void) { return 0; }
-
-int main(void) {
-  CU_pSuite pSuite = NULL;
-  unsigned int num_tests_failed;
-
-  /* initialize the CUnit test registry */
-  if (CUE_SUCCESS != CU_initialize_registry())
-    return (int)CU_get_error();
-
-  /* add a suite to the registry */
-  pSuite = CU_add_suite("libnghttp2_TestSuite", init_suite1, clean_suite1);
-  if (NULL == pSuite) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
-
-  /* add the tests to the suite */
-  if (!CU_add_test(pSuite, "failmalloc_session_send",
-                   test_nghttp2_session_send) ||
-      !CU_add_test(pSuite, "failmalloc_session_send_server",
-                   test_nghttp2_session_send_server) ||
-      !CU_add_test(pSuite, "failmalloc_session_recv",
-                   test_nghttp2_session_recv) ||
-      !CU_add_test(pSuite, "failmalloc_frame", test_nghttp2_frame) ||
-      !CU_add_test(pSuite, "failmalloc_hd", test_nghttp2_hd)) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
+int main(int argc, char *argv[]) {
+  const MunitSuite suites[] = {
+      failmalloc_suite,
+      {NULL, NULL, NULL, 0, MUNIT_SUITE_OPTION_NONE},
+  };
+  const MunitSuite suite = {
+      "", NULL, suites, 1, MUNIT_SUITE_OPTION_NONE,
+  };
 
-  /* Run all tests using the CUnit Basic interface */
-  CU_basic_set_mode(CU_BRM_VERBOSE);
-  CU_basic_run_tests();
-  num_tests_failed = CU_get_number_of_tests_failed();
-  CU_cleanup_registry();
-  if (CU_get_error() == CUE_SUCCESS) {
-    return (int)num_tests_failed;
-  } else {
-    printf("CUnit Error: %s\n", CU_get_error_msg());
-    return (int)CU_get_error();
-  }
+  return munit_suite_main(&suite, NULL, argc, argv);
 }