From b826bfc171d90f8bde7bd672c0ac14201b8b2742 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 16 Nov 2020 20:44:29 -0800 Subject: Work for test refactoring. There are a few major areas in this change. * CMake options are now located in a common cmake/NNGOptions.cmake file. This should make it easier for folks to figure out what the options are, and how they are used. * Tests are now scoped with their directory name, which should avoid possible name collisions with test names. * A number of tests have been either moved or incorporated into the newer testutil/acutest framework. We are moving away from my old c-convey framework to something easier to debug. * We use CMake directories a bit more extensively leading to a much cleaner CMake structure. It's not complete, but a big step in the right direction, and a preview of future work. * Tests are now run with verbose flags, so we get more test results in the CI/CD logs. --- src/supplemental/websocket/wssfile_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/supplemental/websocket') diff --git a/src/supplemental/websocket/wssfile_test.c b/src/supplemental/websocket/wssfile_test.c index 8a0f95b2..3f69cadc 100644 --- a/src/supplemental/websocket/wssfile_test.c +++ b/src/supplemental/websocket/wssfile_test.c @@ -137,7 +137,7 @@ init_listener_wss_file(nng_listener l) nni_strfree(pth); } -void +static void test_invalid_verify(void) { uint16_t port = testutil_next_port(); @@ -180,14 +180,14 @@ test_invalid_verify(void) TEST_NNG_PASS(nng_close(s2)); } -void +static void test_no_verify(void) { nng_socket s1; nng_socket s2; nng_listener l; nng_dialer d; - char addr[NNG_MAXADDRLEN]; + char addr[64]; nng_msg * msg; nng_pipe p; bool b; @@ -232,7 +232,7 @@ test_no_verify(void) TEST_NNG_PASS(nng_close(s2)); } -void +static void test_verify_works(void) { nng_socket s1; @@ -280,7 +280,7 @@ test_verify_works(void) TEST_NNG_PASS(nng_close(s2)); } -void +static void test_cert_file_not_present(void) { nng_socket s1; -- cgit v1.2.3-70-g09d2