Move to devops hosted agent (#539)

* Test windows hosted agent

* Update CMakeLists.txt

* Update CMakeLists.txt

* generate c++ wrappers

* added generate_c_wrapper

* supress 4505

* fix 4505 warning

* vsprintf_wchar_with_empty_string_succeeds test

* fixed warnings and x64 build

* fix unix build

* fix guid tests

* fix win32 unit test

* putback compile_c_test_artifacts_as directive

* added back compile_c_test_artifacts_as

* fixed uniqueid_ut_test_file

* default use_cppunittest to off

x64 build will enable it to test both c and cpp unit tests

* fix cmake warnings

* move to cmake v3.5

* update to use our 1es agents

* pr feedback

* remove guid comment

* fixed EOF

Author: ericwolz

CMakeLists.txt

@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 if (TARGET aziotsharedutil)
     RETURN()
@@ -26,7 +26,7 @@ option(use_default_uuid "set use_default_uuid to ON to use the out of the box UU
 option(run_e2e_tests "set run_e2e_tests to ON to run e2e tests (default is OFF). Chsare dutility does not have any e2e tests, but the option needs to exist to evaluate in IF statements" OFF)
 option(run_int_tests "set run_int_tests to ON to integration tests (default is OFF)." OFF)
 option(use_builtin_httpapi "set use_builtin_httpapi to ON to use the built-in httpapi_compact that comes with C shared utility (default is OFF)" OFF)
-option(use_cppunittest "set use_cppunittest to ON to build CppUnitTest tests on Windows (default is ON)" ON)
+option(use_cppunittest "set use_cppunittest to ON to build CppUnitTest tests on Windows (default is OFF)" OFF)
 option(suppress_header_searches "do not try to find headers - used when compiler check will fail" OFF)
 option(use_custom_heap "use externally defined heap functions instead of the malloc family" OFF)
 

adapters/string_utils.c

@@ -24,15 +24,15 @@ IMPLEMENT_MOCKABLE_FUNCTION(, char*, vsprintf_char, const char*, format, va_list
     }
     else
     {
-        result = (char*)malloc((neededSize + 1) * sizeof(char));
+        result = (char*)malloc(((unsigned long long)neededSize + 1) * sizeof(char));
         if (result == NULL)
         {
             LogError("failure in malloc");
             /*return as is*/
         }
         else
         {
-            if (vsnprintf(result, neededSize + 1, format, va) != neededSize)
+            if (vsnprintf(result, (unsigned long long)neededSize + 1, format, va) != neededSize)
             {
                 LogError("inconsistent vsnprintf behavior");
                 free(result);
@@ -54,15 +54,15 @@ IMPLEMENT_MOCKABLE_FUNCTION(, wchar_t*, vsprintf_wchar, const wchar_t*, format,
     }
     else
     {
-        result = (wchar_t*)malloc((neededSize + 1)*sizeof(wchar_t));
+        result = (wchar_t*)malloc(((unsigned long long)neededSize + 1)*sizeof(wchar_t));
         if (result == NULL)
         {
             LogError("failure in malloc");
             /*return as is*/
         }
         else
         {
-            if (vswprintf(result, neededSize + 1, format, va) != neededSize)
+            if (vswprintf(result, (unsigned long long)neededSize + 1, format, va) != neededSize)
             {
                 LogError("inconsistent vswprintf behavior");
                 free(result);

build/.vsts-ci.yml

@@ -23,11 +23,11 @@ jobs:
     displayName: 'build'
 - job: windowsx86
   pool:
-    name: 'aziotbld-win03'
+    vmImage: 'vs2017-win2016'
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c.cmd)
     displayName: 'build'
     env:
@@ -51,7 +51,8 @@ jobs:
 - job: raspberrypi
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/raspberrypi-c-buster:brown"
-  pool: aziotbld-lin01
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: raspberrypi
   steps:
   - script: |
@@ -63,7 +64,8 @@ jobs:
 - job: linuxoptions
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-linux-c-ubuntu"
-  pool: aziotbld-lin01
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'linux-options'
   steps:
   - script: |
@@ -78,11 +80,11 @@ jobs:
     condition: always()
 - job: windowsdynamic
   pool:
-    name: 'aziotbld-win03'
+    vmImage: 'vs2017-win2016'
   steps:
   - script: |
      if exist jenkins\windows_c_build_as_dynamic.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c_build_as_dynamic.cmd)
     displayName: 'build'
     env:
@@ -139,7 +141,8 @@ jobs:
 - job: clang
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/ubuntu-clang"
-  pool: aziotbld-lin01
+  pool:
+      name: 'sdk-c--ubuntu-18'
   displayName: 'clang'
   steps:
   - script: |
@@ -174,7 +177,8 @@ jobs:
 - job: ubuntu1604
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-ubuntu"
-  pool: aziotbld-lin02
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'ubuntu1604'
   steps:
   - script: |
@@ -209,7 +213,8 @@ jobs:
 - job: debian
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/c-debian"
-  pool: aziotbld-lin01
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'debian'
   steps:
   - script: |
@@ -244,7 +249,8 @@ jobs:
 - job: linux_mbed
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-mbed"
-  pool: aziotbld-lin01
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'linux_mbed'
   steps:
   - script: |
@@ -277,7 +283,8 @@ jobs:
 - job: wolfssl
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-c-wolfssl"
-  pool: aziotbld-lin01
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'wolfssl'
   steps:
   - script: |
@@ -316,7 +323,8 @@ jobs:
 - job: bearssl
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-c-bearssl"
-  pool: aziotbld-lin01
+  pool: 
+      name: 'sdk-c--ubuntu-18'
   displayName: 'bearssl'
   steps:
   - script: |
@@ -350,12 +358,12 @@ jobs:
     condition: always()
 - job: windowsx64
   pool:
-    name: 'aziotbld-win03'
+    vmImage: 'vs2017-win2016'
   displayName: 'windowsx64'
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c.cmd --platform x64)
     displayName: 'build'
     env:

build_all/mbed/CMakeLists.txt

@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../..)
 set(mbed_project_base "azure_c_shared_utility" CACHE STRING "The item being built")

build_all/windows/build.cmd

@@ -132,7 +132,7 @@ if %MAKE_NUGET_PKG% == yes (
 	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 ) else (
 	echo ***Running CMAKE for Win64***
-	cmake %build-root% -G "Visual Studio 15 2017" -A x64 -Drun_unittests:bool=ON -Drun_int_tests=ON
+	cmake %build-root% -G "Visual Studio 15 2017" -A x64 -Drun_unittests:bool=ON -Drun_int_tests=ON -Duse_cppunittest=ON
 	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 )
 

configs/azure_iot_build_rules.cmake

@@ -187,6 +187,23 @@ function(compileTargetAsC11 theTarget)
   endif()
 endfunction()
 
+macro(generate_cpp_wrapper setVar whatIsBuilding)
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx "#include \"${CMAKE_CURRENT_SOURCE_DIR}/${whatIsBuilding}.c\"")
+  set(${setVar} ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx)
+endmacro(generate_cpp_wrapper)
+
+macro(generate_cppunittest_wrapper whatIsBuilding)
+    if (${use_cppunittest} AND WIN32)
+      file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx "#include \"${CMAKE_CURRENT_SOURCE_DIR}/${whatIsBuilding}.c\"")
+      set(${whatIsBuilding}_test_files ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx)
+      #CPP compiler on windows likes to complain about unused local function removed (C4505)
+      #C compiler doesn't like to complain about the same thing
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4505")
+    else()
+      set(${whatIsBuilding}_test_files ${whatIsBuilding}.c)
+    endif()
+endmacro(generate_cppunittest_wrapper)
+
 IF((WIN32) AND (NOT(MINGW)))
     #windows needs this define
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)

inc/azure_c_shared_utility/string_utils.h

@@ -49,7 +49,7 @@ printf("PartitionId = %" GUID_FORMAT "\n", GUID_VALUES(fabricDeployedStatefulSer
 PartitionId=316132b8-96a0-4bc7-aecc-a16e7c5a6bf6
 */
 #define GUID_FORMAT "8.8" PRIx32 "-%4.4" PRIx16 "-%4.4" PRIx16 "-%4.4" PRIx16 "-%12.12" PRIx64
-#define GUID_VALUES(guid) (guid).Data1, (guid).Data2, (guid).Data3, ((guid).Data4[0]<<8) + (guid).Data4[1], ((uint64_t)((guid).Data4[2])<<40) + ((uint64_t)((guid).Data4[3])<<32) + (((uint64_t)(guid).Data4[4])<<24) + ((guid).Data4[5]<<16) + ((guid).Data4[6]<<8) + ((guid).Data4[7])
+#define GUID_VALUES(guid) (guid).Data1, (guid).Data2, (guid).Data3, (unsigned int)((((uint64_t)(guid).Data4[0]))<<8) + (guid).Data4[1], (((uint64_t)((guid).Data4[2]))<<40) + (((uint64_t)((guid).Data4[3]))<<32) + (((uint64_t)((guid).Data4[4]))<<24) + (((uint64_t)((guid).Data4[5]))<<16) + (((uint64_t)((guid).Data4[6]))<<8) + ((guid).Data4[7])
 
 /*takes a FILETIME, returns a nice string representation of it*/
 char* FILETIME_toAsciiArray(const FILETIME* fileTime);

samples/CMakeLists.txt

@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 function(add_sample_directory whatIsBuilding)
     add_subdirectory(${whatIsBuilding})

samples/socketio_connect/mbed/CMakeLists.txt

@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../..)
 set(mbed_project_base "socketio_connect" CACHE STRING "The item being built")

samples/tlsio_connect/CMakeLists.txt

@@ -1,9 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-set(tlsio_connect_c_files
-    main.c
-)
+generate_cpp_wrapper(tlsio_connect_c_files main)
 
 IF(WIN32)
     #windows needs this define

samples/tlsio_connect/mbed/CMakeLists.txt

@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../..)
 set(mbed_project_base "tlsio_connect" CACHE STRING "The item being built")

tests/agenttime_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName agenttime_ut)
 
-set(${theseTestsName}_test_files
-${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
 ../../pal/agenttime.c

tests/azure_base32_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName azure_base32_ut)
 
-set(${theseTestsName}_test_files
-    ${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
     ../../src/azure_base32.c

tests/azure_base64_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName azure_base64_ut)
 
-set(${theseTestsName}_test_files
-    ${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
     ../../src/azure_base64.c

tests/buffer_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName buffer_ut)
 
-set(${theseTestsName}_test_files
-${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
 ../../src/buffer.c

tests/condition_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName condition_ut)
 
-set(${theseTestsName}_test_files
-	${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
 	${CONDITION_C_FILE}

tests/connectionstringparser_ut/CMakeLists.txt

@@ -1,13 +1,11 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName connectionstringparser_ut)
 
-set(${theseTestsName}_test_files
-${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 include_directories(${SHARED_UTIL_REAL_TEST_FOLDER})
 

tests/constbuffer_array_batcher_ut/CMakeLists.txt

@@ -1,12 +1,10 @@
 #Copyright (c) Microsoft. All rights reserved.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName constbuffer_array_batcher_ut)
 
-set(${theseTestsName}_test_files
-${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
 ../../src/constbuffer_array_batcher.c

tests/constbuffer_array_ut/CMakeLists.txt

@@ -1,12 +1,10 @@
 #Copyright (c) Microsoft. All rights reserved.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(theseTestsName constbuffer_array_ut)
 
-set(${theseTestsName}_test_files
-    ${theseTestsName}.c
-)
+generate_cppunittest_wrapper(${theseTestsName})
 
 set(${theseTestsName}_c_files
     ../../src/constbuffer_array.c