move to dev ops OSX (#640)

* move to dev ops OSX

* include #include <stdio.h>

* update to VS2022

* added #include <string.h>

* update includes

* disable constbuffer_ut

* disable lock_ut

* disable refcount_ut

* try macOS-12

* try macOS-13

* exclude MAC

* conversion

* handle main() int return

* compile issues

* no-strict-prototypes

* strict-prototypes

* add_definitions(-DOPENSSL_NO_DEPRECATED)

* compile flags

* c99

Author: ericwolz

CMakeLists.txt

@@ -54,7 +54,7 @@ if(WIN32)
 
 else()
     option(use_schannel "set use_schannel to ON if schannel is to be used, set to OFF to not use schannel" OFF)
-    if(MACOSX)
+    if(DEFINED MACOSX)
         option(use_openssl "set use_openssl to ON if openssl is to be used, set to OFF to not use openssl" OFF)
         option(use_socketio "set use_socketio to ON if socketio is to be included in the library, set to OFF if a different implementation will be provided" OFF)
     else()
@@ -71,7 +71,7 @@ option(no_logging "disable logging (default is OFF)" OFF)
 
 # The options setting for use_socketio is not reliable. If openssl is used, make sure it's on,
 # and if apple tls is used then use_socketio must be off.
-if (MACOSX)
+if (DEFINED MACOSX)
     if (${use_openssl})
         set(use_socketio ON)
     else()
@@ -472,7 +472,7 @@ SOURCE_GROUP(devdoc FILES ${aziotsharedutil_md_files})
 
 # Add ignore deprecated functions so we may use 1.1.1 APIs
 # in OpenSSL 3
-if(LINUX OR MACOSX)
+if(DEFINED LINUX OR DEFINED MACOSX)
   set_property(
     SOURCE
       ${CMAKE_CURRENT_LIST_DIR}/adapters/tlsio_openssl.c

build/.vsts-ci.yml

@@ -51,11 +51,10 @@ jobs:
 - job: windowsx86
   displayName: Windows x86
   pool:
-    name: 'sdk-c--win-vs2017'
+    name: 'sdk-c--win-vs2022'
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c.cmd)
     displayName: 'Build'
   - script: |
@@ -83,12 +82,11 @@ jobs:
     CodeQL.Enabled: true
     CodeQL.Language: cpp
   pool:
-    name: 'sdk-c--win-vs2017'
+    name: 'sdk-c--win-vs2022'
   displayName: 'Windows x64'
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c.cmd --platform x64)
     displayName: 'Build'
   - script: |
@@ -117,11 +115,10 @@ jobs:
 - job: windowsdynamic
   displayName: Windows Dynamic
   pool:
-    name: 'sdk-c--win-vs2017'
+    name: 'sdk-c--win-vs2022'
   steps:
   - script: |
      if exist jenkins\windows_c_build_as_dynamic.cmd (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c_build_as_dynamic.cmd)
     displayName: 'Build'
     env:
@@ -480,7 +477,7 @@ jobs:
 - job: OSX
   displayName: OSX
   pool:
-    name: OSX
+    vmImage: 'macOS-13'
   steps:
   - script: |
      if [ -f "jenkins/osx_gcc_openssl.sh" ]
@@ -515,7 +512,7 @@ jobs:
 - job: xcodenative
   displayName: XCode Native
   pool:
-    name: OSX
+    vmImage: 'macOS-13'
   steps:
   - script: |
      if [ -f "jenkins/osx_xcode_native.sh" ]

tests/CMakeLists.txt

@@ -30,7 +30,7 @@ if(${run_unittests})
         add_subdirectory(httpapicompact_ut)
     endif()
     add_subdirectory(singlylinkedlist_ut)
-    add_subdirectory(lock_ut)    
+    add_subdirectory(lock_ut)
     add_subdirectory(map_ut)
     add_subdirectory(refcount_ut)
     add_subdirectory(sastoken_ut)
@@ -47,7 +47,7 @@ if(${run_unittests})
     endif()
 
     #normally, with proper include paths, the below tests can be run under windows too.
-    if(${use_openssl})
+    if(${use_openssl} AND NOT DEFINED MACOSX)
         add_subdirectory(x509_openssl_ut/engine)
         add_subdirectory(x509_openssl_ut/no_engine)
     endif()
@@ -93,9 +93,9 @@ if(${run_unittests})
 
     add_subdirectory(utf8_checker_ut)
     add_subdirectory(http_proxy_io_ut)
-    if(NOT DEFINED MACOSX)
-        #add_subdirectory(socket_async_ut)
-        #add_subdirectory(dns_resolver_ut)
+    if(DEFINED LINUX)
+        add_subdirectory(dns_resolver_ut)
+        add_subdirectory(socket_async_ut)
     endif()
 
     #Add template as reference for new tests

tests/agenttime_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(agenttime_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/azure_base32_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(azure_base32_ut, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/azure_base64_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(base64_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/condition_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(Condition_UnitTests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/connectionstringparser_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(connectionstringparser_ut, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/constbuffer_array_batcher_ut/main.c

@@ -7,5 +7,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(constbuffer_array_batcher_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/constbuffer_array_ut/main.c

@@ -7,5 +7,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(constbuffer_array_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/constbuffer_ut/CMakeLists.txt

@@ -16,3 +16,4 @@ set(${theseTestsName}_h_files
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
 
+compile_c_test_artifacts_as(${theseTestsName} C99)

tests/constmap_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(constmap_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/crtabstractions_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(CRTAbstractions_UnitTests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/dns_resolver_ut/dns_resolver_ut.c

@@ -39,6 +39,11 @@ void* my_gballoc_malloc(size_t size)
     return malloc(size);
 }
 
+void* my_gballoc_calloc(size_t nmemb, size_t size)
+{
+    return calloc(nmemb, size);
+}
+
 void* my_gballoc_realloc(void* ptr, size_t size)
 {
     return realloc(ptr, size);
@@ -140,6 +145,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
         ASSERT_ARE_EQUAL(int, 0, result);
 
         REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc);
+        REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc);
         REGISTER_GLOBAL_MOCK_FAIL_RETURN(gballoc_malloc, NULL);
         REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free);
 
@@ -187,7 +193,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     TEST_FUNCTION(dns_resolver__is_complete_repeated_call__succeeds)
     {
         ///arrange
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
         // We're calling this twice
         bool result = dns_resolver_is_lookup_complete(dns);
         uint32_t ipv4 = dns_resolver_get_ipv4(dns);
@@ -220,7 +226,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     {
         ///arrange
         bool result;
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
         umock_c_reset_all_calls();
         STRICT_EXPECTED_CALL(getaddrinfo(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
 
@@ -240,7 +246,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
         ///arrange
         bool result;
         uint32_t ipv4;
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
         umock_c_reset_all_calls();
         STRICT_EXPECTED_CALL(getaddrinfo(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
         result = dns_resolver_is_lookup_complete(dns);
@@ -261,7 +267,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     {
         ///arrange
         bool result;
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
         umock_c_reset_all_calls();
         STRICT_EXPECTED_CALL(getaddrinfo(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG)).SetReturn(GETADDRINFO_FAIL);
 
@@ -281,7 +287,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
         ///arrange
         bool result;
         uint32_t ipv4;
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
         umock_c_reset_all_calls();
         STRICT_EXPECTED_CALL(getaddrinfo(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG)).SetReturn(GETADDRINFO_FAIL);
         result = dns_resolver_is_lookup_complete(dns);
@@ -314,7 +320,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     TEST_FUNCTION(dns_resolver__get_ipv4_too_early__fails)
     {
         ///arrange
-        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE dns = dns_resolver_create("fake.com", 53, NULL);
 
         ///act
         uint32_t result = dns_resolver_get_ipv4(dns);
@@ -355,7 +361,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     TEST_FUNCTION(dns_resolver__destroy__success)
     {
         ///arrange
-        DNSRESOLVER_HANDLE result = dns_resolver_create("fake.com", NULL);
+        DNSRESOLVER_HANDLE result = dns_resolver_create("fake.com", 53, NULL);
         umock_c_reset_all_calls();
 
         STRICT_EXPECTED_CALL(gballoc_free(IGNORED_NUM_ARG));  // copy hostname
@@ -373,11 +379,11 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
     {
         ///arrange
         DNSRESOLVER_HANDLE result;
-        STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG));  // copy hostname
+        STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG));  // copy hostname
         STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG));  // instance
 
         ///act
-        result = dns_resolver_create("fake.com", NULL);
+        result = dns_resolver_create("fake.com", 53, NULL);
 
         ///assert
         ASSERT_IS_NOT_NULL(result);
@@ -395,7 +401,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
         int negativeTestsInitResult = umock_c_negative_tests_init();
         ASSERT_ARE_EQUAL(int, 0, negativeTestsInitResult);
 
-        STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG));  // copy hostname
+        STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG));  // copy hostname
         STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG));  // instance
         umock_c_negative_tests_snapshot();
 
@@ -407,7 +413,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
             umock_c_negative_tests_fail_call(i);
 
             ///act
-            result = dns_resolver_create("fake.com", NULL);
+            result = dns_resolver_create("fake.com", 53, NULL);
 
             ///assert
             ASSERT_IS_NULL(result);
@@ -423,7 +429,7 @@ BEGIN_TEST_SUITE(dns_resolver_ut)
         ///arrange
 
         ///act
-        DNSRESOLVER_HANDLE result = dns_resolver_create(NULL, NULL);
+        DNSRESOLVER_HANDLE result = dns_resolver_create(NULL, 53, NULL);
 
         ///assert
         ASSERT_IS_NULL(result, "Unexpected success with NULL hostname");

tests/dns_resolver_ut/main.c

@@ -12,5 +12,5 @@ int main(void)
      */
     RUN_TEST_SUITE(dns_resolver_ut, failedTestCount);
 
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/doublylinkedlist_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(doublylinkedlist_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/gballoc_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(GBAlloc_UnitTests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/gballoc_without_init_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(GBAlloc_For_Init_UnitTests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/hmacsha256_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(HMACSHA256_UnitTests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/http_proxy_io_ut/http_proxy_io_ut.c

@@ -1582,15 +1582,14 @@ TEST_FUNCTION(http_proxy_io_clone_option_succeeds)
 {
     // arrange
     CONCRETE_IO_HANDLE http_io;
-    OPTIONHANDLER_HANDLE options;
 
     http_io = http_proxy_io_get_interface_description()->concrete_io_create((void*)&default_http_proxy_io_config);
 
     umock_c_reset_all_calls();
     STRICT_EXPECTED_CALL(OptionHandler_Create(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
     STRICT_EXPECTED_CALL(xio_retrieveoptions(TEST_IO_HANDLE));
     STRICT_EXPECTED_CALL(OptionHandler_AddOption(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
-    options = http_proxy_io_get_interface_description()->concrete_io_retrieveoptions(http_io);
+    http_proxy_io_get_interface_description()->concrete_io_retrieveoptions(http_io);
 
     ASSERT_IS_NOT_NULL(tlsio_clone_option);
 
@@ -1614,15 +1613,14 @@ TEST_FUNCTION(http_proxy_io_destroy_option_succeeds)
 {
     // arrange
     CONCRETE_IO_HANDLE http_io;
-    OPTIONHANDLER_HANDLE options;
 
     http_io = http_proxy_io_get_interface_description()->concrete_io_create((void*)&default_http_proxy_io_config);
 
     umock_c_reset_all_calls();
     STRICT_EXPECTED_CALL(OptionHandler_Create(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
     STRICT_EXPECTED_CALL(xio_retrieveoptions(TEST_IO_HANDLE));
     STRICT_EXPECTED_CALL(OptionHandler_AddOption(IGNORED_PTR_ARG, IGNORED_PTR_ARG, IGNORED_PTR_ARG));
-    options = http_proxy_io_get_interface_description()->concrete_io_retrieveoptions(http_io);
+    http_proxy_io_get_interface_description()->concrete_io_retrieveoptions(http_io);
 
     ASSERT_IS_NOT_NULL(tlsio_destroy_option);
 

tests/http_proxy_io_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(http_proxy_io_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/httpapicompact_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(httpapicompact_ut, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }

tests/httpapiex_ut/main.c

@@ -8,5 +8,5 @@ int main(void)
 {
     size_t failedTestCount = 0;
     RUN_TEST_SUITE(httpapiex_unittests, failedTestCount);
-    return failedTestCount;
+    return (int)failedTestCount;
 }