Merging upstream version 1.60.0.

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

1 files changed, 15 insertions, 195 deletions

diff --git a/src/shrpx-unittest.cc b/src/shrpx-unittest.cc
index f089adf..ec707e5 100644
--- a/src/shrpx-unittest.cc
+++ b/src/shrpx-unittest.cc
@@ -26,9 +26,8 @@
 #  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 "shrpx_tls_test.h"
 #include "shrpx_downstream_test.h"
@@ -47,200 +46,21 @@
 #include "shrpx_router_test.h"
 #include "shrpx_log.h"
 
-static int init_suite1(void) { return 0; }
-
-static int clean_suite1(void) { return 0; }
-
 int main(int argc, char *argv[]) {
-  CU_pSuite pSuite = nullptr;
-  unsigned int num_tests_failed;
-
   shrpx::create_config();
 
-  // initialize the CUnit test registry
-  if (CUE_SUCCESS != CU_initialize_registry())
-    return CU_get_error();
-
-  // add a suite to the registry
-  pSuite = CU_add_suite("shrpx_TestSuite", init_suite1, clean_suite1);
-  if (nullptr == pSuite) {
-    CU_cleanup_registry();
-    return CU_get_error();
-  }
-
-  // add the tests to the suite
-  if (!CU_add_test(pSuite, "tls_create_lookup_tree",
-                   shrpx::test_shrpx_tls_create_lookup_tree) ||
-      !CU_add_test(pSuite, "tls_cert_lookup_tree_add_ssl_ctx",
-                   shrpx::test_shrpx_tls_cert_lookup_tree_add_ssl_ctx) ||
-      !CU_add_test(pSuite, "tls_tls_hostname_match",
-                   shrpx::test_shrpx_tls_tls_hostname_match) ||
-      !CU_add_test(pSuite, "tls_tls_verify_numeric_hostname",
-                   shrpx::test_shrpx_tls_verify_numeric_hostname) ||
-      !CU_add_test(pSuite, "tls_tls_verify_dns_hostname",
-                   shrpx::test_shrpx_tls_verify_dns_hostname) ||
-      !CU_add_test(pSuite, "http2_add_header", shrpx::test_http2_add_header) ||
-      !CU_add_test(pSuite, "http2_get_header", shrpx::test_http2_get_header) ||
-      !CU_add_test(pSuite, "http2_copy_headers_to_nva",
-                   shrpx::test_http2_copy_headers_to_nva) ||
-      !CU_add_test(pSuite, "http2_build_http1_headers_from_headers",
-                   shrpx::test_http2_build_http1_headers_from_headers) ||
-      !CU_add_test(pSuite, "http2_lws", shrpx::test_http2_lws) ||
-      !CU_add_test(pSuite, "http2_rewrite_location_uri",
-                   shrpx::test_http2_rewrite_location_uri) ||
-      !CU_add_test(pSuite, "http2_parse_http_status_code",
-                   shrpx::test_http2_parse_http_status_code) ||
-      !CU_add_test(pSuite, "http2_index_header",
-                   shrpx::test_http2_index_header) ||
-      !CU_add_test(pSuite, "http2_lookup_token",
-                   shrpx::test_http2_lookup_token) ||
-      !CU_add_test(pSuite, "http2_parse_link_header",
-                   shrpx::test_http2_parse_link_header) ||
-      !CU_add_test(pSuite, "http2_path_join", shrpx::test_http2_path_join) ||
-      !CU_add_test(pSuite, "http2_normalize_path",
-                   shrpx::test_http2_normalize_path) ||
-      !CU_add_test(pSuite, "http2_rewrite_clean_path",
-                   shrpx::test_http2_rewrite_clean_path) ||
-      !CU_add_test(pSuite, "http2_get_pure_path_component",
-                   shrpx::test_http2_get_pure_path_component) ||
-      !CU_add_test(pSuite, "http2_construct_push_component",
-                   shrpx::test_http2_construct_push_component) ||
-      !CU_add_test(pSuite, "http2_contains_trailers",
-                   shrpx::test_http2_contains_trailers) ||
-      !CU_add_test(pSuite, "http2_check_transfer_encoding",
-                   shrpx::test_http2_check_transfer_encoding) ||
-      !CU_add_test(pSuite, "downstream_field_store_append_last_header",
-                   shrpx::test_downstream_field_store_append_last_header) ||
-      !CU_add_test(pSuite, "downstream_field_store_header",
-                   shrpx::test_downstream_field_store_header) ||
-      !CU_add_test(pSuite, "downstream_crumble_request_cookie",
-                   shrpx::test_downstream_crumble_request_cookie) ||
-      !CU_add_test(pSuite, "downstream_assemble_request_cookie",
-                   shrpx::test_downstream_assemble_request_cookie) ||
-      !CU_add_test(pSuite, "downstream_rewrite_location_response_header",
-                   shrpx::test_downstream_rewrite_location_response_header) ||
-      !CU_add_test(pSuite, "downstream_supports_non_final_response",
-                   shrpx::test_downstream_supports_non_final_response) ||
-      !CU_add_test(pSuite, "downstream_find_affinity_cookie",
-                   shrpx::test_downstream_find_affinity_cookie) ||
-      !CU_add_test(pSuite, "config_parse_header",
-                   shrpx::test_shrpx_config_parse_header) ||
-      !CU_add_test(pSuite, "config_parse_log_format",
-                   shrpx::test_shrpx_config_parse_log_format) ||
-      !CU_add_test(pSuite, "config_read_tls_ticket_key_file",
-                   shrpx::test_shrpx_config_read_tls_ticket_key_file) ||
-      !CU_add_test(pSuite, "config_read_tls_ticket_key_file_aes_256",
-                   shrpx::test_shrpx_config_read_tls_ticket_key_file_aes_256) ||
-      !CU_add_test(pSuite, "worker_match_downstream_addr_group",
-                   shrpx::test_shrpx_worker_match_downstream_addr_group) ||
-      !CU_add_test(pSuite, "http_create_forwarded",
-                   shrpx::test_shrpx_http_create_forwarded) ||
-      !CU_add_test(pSuite, "http_create_via_header_value",
-                   shrpx::test_shrpx_http_create_via_header_value) ||
-      !CU_add_test(pSuite, "http_create_affinity_cookie",
-                   shrpx::test_shrpx_http_create_affinity_cookie) ||
-      !CU_add_test(pSuite, "http_create_atlsvc_header_field_value",
-                   shrpx::test_shrpx_http_create_altsvc_header_value) ||
-      !CU_add_test(pSuite, "http_check_http_scheme",
-                   shrpx::test_shrpx_http_check_http_scheme) ||
-      !CU_add_test(pSuite, "router_match", shrpx::test_shrpx_router_match) ||
-      !CU_add_test(pSuite, "router_match_wildcard",
-                   shrpx::test_shrpx_router_match_wildcard) ||
-      !CU_add_test(pSuite, "router_match_prefix",
-                   shrpx::test_shrpx_router_match_prefix) ||
-      !CU_add_test(pSuite, "util_streq", shrpx::test_util_streq) ||
-      !CU_add_test(pSuite, "util_strieq", shrpx::test_util_strieq) ||
-      !CU_add_test(pSuite, "util_inp_strlower",
-                   shrpx::test_util_inp_strlower) ||
-      !CU_add_test(pSuite, "util_to_base64", shrpx::test_util_to_base64) ||
-      !CU_add_test(pSuite, "util_to_token68", shrpx::test_util_to_token68) ||
-      !CU_add_test(pSuite, "util_percent_encode_token",
-                   shrpx::test_util_percent_encode_token) ||
-      !CU_add_test(pSuite, "util_percent_decode",
-                   shrpx::test_util_percent_decode) ||
-      !CU_add_test(pSuite, "util_quote_string",
-                   shrpx::test_util_quote_string) ||
-      !CU_add_test(pSuite, "util_utox", shrpx::test_util_utox) ||
-      !CU_add_test(pSuite, "util_http_date", shrpx::test_util_http_date) ||
-      !CU_add_test(pSuite, "util_select_h2", shrpx::test_util_select_h2) ||
-      !CU_add_test(pSuite, "util_ipv6_numeric_addr",
-                   shrpx::test_util_ipv6_numeric_addr) ||
-      !CU_add_test(pSuite, "util_utos", shrpx::test_util_utos) ||
-      !CU_add_test(pSuite, "util_make_string_ref_uint",
-                   shrpx::test_util_make_string_ref_uint) ||
-      !CU_add_test(pSuite, "util_utos_unit", shrpx::test_util_utos_unit) ||
-      !CU_add_test(pSuite, "util_utos_funit", shrpx::test_util_utos_funit) ||
-      !CU_add_test(pSuite, "util_parse_uint_with_unit",
-                   shrpx::test_util_parse_uint_with_unit) ||
-      !CU_add_test(pSuite, "util_parse_uint", shrpx::test_util_parse_uint) ||
-      !CU_add_test(pSuite, "util_parse_duration_with_unit",
-                   shrpx::test_util_parse_duration_with_unit) ||
-      !CU_add_test(pSuite, "util_duration_str",
-                   shrpx::test_util_duration_str) ||
-      !CU_add_test(pSuite, "util_format_duration",
-                   shrpx::test_util_format_duration) ||
-      !CU_add_test(pSuite, "util_starts_with", shrpx::test_util_starts_with) ||
-      !CU_add_test(pSuite, "util_ends_with", shrpx::test_util_ends_with) ||
-      !CU_add_test(pSuite, "util_parse_http_date",
-                   shrpx::test_util_parse_http_date) ||
-      !CU_add_test(pSuite, "util_localtime_date",
-                   shrpx::test_util_localtime_date) ||
-      !CU_add_test(pSuite, "util_get_uint64", shrpx::test_util_get_uint64) ||
-      !CU_add_test(pSuite, "util_parse_config_str_list",
-                   shrpx::test_util_parse_config_str_list) ||
-      !CU_add_test(pSuite, "util_make_http_hostport",
-                   shrpx::test_util_make_http_hostport) ||
-      !CU_add_test(pSuite, "util_make_hostport",
-                   shrpx::test_util_make_hostport) ||
-      !CU_add_test(pSuite, "util_strifind", shrpx::test_util_strifind) ||
-      !CU_add_test(pSuite, "util_random_alpha_digit",
-                   shrpx::test_util_random_alpha_digit) ||
-      !CU_add_test(pSuite, "util_format_hex", shrpx::test_util_format_hex) ||
-      !CU_add_test(pSuite, "util_is_hex_string",
-                   shrpx::test_util_is_hex_string) ||
-      !CU_add_test(pSuite, "util_decode_hex", shrpx::test_util_decode_hex) ||
-      !CU_add_test(pSuite, "util_extract_host",
-                   shrpx::test_util_extract_host) ||
-      !CU_add_test(pSuite, "util_split_hostport",
-                   shrpx::test_util_split_hostport) ||
-      !CU_add_test(pSuite, "util_split_str", shrpx::test_util_split_str) ||
-      !CU_add_test(pSuite, "util_rstrip", shrpx::test_util_rstrip) ||
-      !CU_add_test(pSuite, "gzip_inflate", test_nghttp2_gzip_inflate) ||
-      !CU_add_test(pSuite, "buffer_write", nghttp2::test_buffer_write) ||
-      !CU_add_test(pSuite, "pool_recycle", nghttp2::test_pool_recycle) ||
-      !CU_add_test(pSuite, "memchunk_append", nghttp2::test_memchunks_append) ||
-      !CU_add_test(pSuite, "memchunk_drain", nghttp2::test_memchunks_drain) ||
-      !CU_add_test(pSuite, "memchunk_riovec", nghttp2::test_memchunks_riovec) ||
-      !CU_add_test(pSuite, "memchunk_recycle",
-                   nghttp2::test_memchunks_recycle) ||
-      !CU_add_test(pSuite, "memchunk_reset", nghttp2::test_memchunks_reset) ||
-      !CU_add_test(pSuite, "peek_memchunk_append",
-                   nghttp2::test_peek_memchunks_append) ||
-      !CU_add_test(pSuite, "peek_memchunk_disable_peek_drain",
-                   nghttp2::test_peek_memchunks_disable_peek_drain) ||
-      !CU_add_test(pSuite, "peek_memchunk_disable_peek_no_drain",
-                   nghttp2::test_peek_memchunks_disable_peek_no_drain) ||
-      !CU_add_test(pSuite, "peek_memchunk_reset",
-                   nghttp2::test_peek_memchunks_reset) ||
-      !CU_add_test(pSuite, "template_immutable_string",
-                   nghttp2::test_template_immutable_string) ||
-      !CU_add_test(pSuite, "template_string_ref",
-                   nghttp2::test_template_string_ref) ||
-      !CU_add_test(pSuite, "base64_encode", nghttp2::test_base64_encode) ||
-      !CU_add_test(pSuite, "base64_decode", nghttp2::test_base64_decode)) {
-    CU_cleanup_registry();
-    return CU_get_error();
-  }
+  const MunitSuite suites[] = {
+      shrpx::tls_suite,    shrpx::downstream_suite,
+      shrpx::config_suite, shrpx::worker_suite,
+      shrpx::http_suite,   shrpx::router_suite,
+      shrpx::http2_suite,  shrpx::util_suite,
+      gzip_suite,          buffer_suite,
+      memchunk_suite,      template_suite,
+      base64_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 num_tests_failed;
-  } else {
-    printf("CUnit Error: %s\n", CU_get_error_msg());
-    return CU_get_error();
-  }
+  return munit_suite_main(&suite, NULL, argc, argv);
 }