Use latest version of googletest (v.1.11.0) for testing across all platforms. (#997)

Author: lalitb

CMakeLists.txt

@@ -259,12 +259,6 @@ if(BUILD_UNIT_TESTS OR BUILD_FUNC_TESTS)
     add_library(gtest STATIC IMPORTED GLOBAL)
     message("Adding gmock")
     add_library(gmock STATIC IMPORTED GLOBAL)
-
-#    message("Building libraries! - Path: ${CMAKE_CURRENT_SOURCE_DIR} ")
-#    message("Building gtest")
-#    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest/)
-#    message("Building gmock")
-#    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest/googlemock/)
 endif()
 
 if(BUILD_APPLE_HTTP)

Solutions/MSTelemetrySDK.sln

@@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net40", "net40\net40.vcxpro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{250EFB82-2F0E-4781-94BB-8313201ABDF0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\googletest\googlemock\msvc\2015\gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\tests\googletest\googlemock\msvc\2015\gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\googletest\googletest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\tests\googletest\googletest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite-uwp", "..\sqliteUWP\sqlite-uwp.vcxproj", "{6883A688-89F5-424A-9BFA-50D42F691B29}"
 EndProject

build-all.bat

@@ -12,6 +12,11 @@ if DEFINED GIT_PULL_TOKEN (
   git clone https://%GIT_PULL_TOKEN%:x-oauth-basic@github.com/microsoft/cpp_client_telemetry_modules.git lib\modules
 )
 
+set GTEST_PATH=third_party\googletest
+if NOT EXIST %GTEST_PATH%\CMakeLists.txt (
+ git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH%
+)
+
 set CUSTOM_PROPS=
 if ("%~1"=="") goto skip
 set CUSTOM_PROPS="/p:ForceImportBeforeCppTargets=%1"

build-gtest.sh

@@ -15,53 +15,43 @@ else
 fi
 
 cd `dirname $0`
-
-GTEST_PATH=googletest
-USE_LATEST_GTEST="false"
-
-echo "Not an ios build. Check for newer googletest requirement"
-OS_NAME=`uname -s`
-
-#TODO: switch all OS builds to Google Test located in third_party/googletest submodule
-if [[ ${IOS_BUILD} == "NO" ]]; then
-case "$OS_NAME" in
-Darwin) 
-  mac_os_ver=$(sw_vers -productVersion)
-  IFS='.' read -r -a mac_ver_first_octet <<< "$mac_os_ver"
-  # Use new Google Test on macOS 11.0 or higher ; old one no longer compiles on 11.0
-  if [[ "$mac_ver_first_octet" -ge 11 ]] ; then
-    echo "running on Mac OS 11.0 or higher"
-    USE_LATEST_GTEST="true"
-  else
-    echo "running older MacOS $mac_os_ver"
-  fi
-  ;;
-Linux)
-  source /etc/os-release
-  echo $VERSION_ID
-  # Use new Google Test on latest Ubuntu 20.04 : old one no longer compiles on 20
-  if [ "$VERSION_ID" == "20.04" ]; then
-    echo "Running on Ubuntu 20.04"
-    USE_LATEST_GTEST="true"
-  fi
-  ;;
-esac
-fi
-
-if [ "$USE_LATEST_GTEST" == "true" ]; then
-  echo "Using latest googletest"
-  GTEST_PATH=third_party/googletest
-  if [ ! "$(ls -A $GTEST_PATH/CMakeLists.txt)" ]; then 
-    echo Clone googletest from google/googletest:master ...
-    rm -rf ${GTEST_PATH} #delete just if empty directory exists
-    git clone https://github.com/google/googletest $GTEST_PATH
-  else
-    echo "Using existing googletest from thirdparty/"
-  fi
+GTEST_PATH=third_party/googletest
+if [ ! "$(ls -A $GTEST_PATH/CMakeLists.txt)" ]; then 
+  echo Clone googletest from google/googletest:master ...
+  rm -rf ${GTEST_PATH} #delete just if empty directory exists
+  git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest $GTEST_PATH
 else
-  echo "Using existing(older) googletest from repo root"
+  echo "Using existing googletest from thirdparty/"
 fi
 
+echo "Add ios and arm64 build steps for googletest"
+cat > $GTEST_PATH/CMakeLists_temp.txt << EOF
+# If building for iOS, set all the iOS options
+if(BUILD_IOS) 
+  set(TARGET_ARCH "APPLE") 
+  set(IOS True)
+  set(APPLE True)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
+  set(CMAKE_C_FLAGS "\${CMAKE_C_FLAGS} -miphoneos-version-min=10.0")
+  set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -miphoneos-version-min=10.0 -std=c++11")
+  set(IOS_PLATFORM "iphonesimulator")
+  set(CMAKE_SYSTEM_PROCESSOR x86_64)
+  execute_process(COMMAND xcodebuild -version -sdk \${IOS_PLATFORM} Path
+    OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message("-- CMAKE_OSX_SYSROOT       \${CMAKE_OSX_SYSROOT}")
+elseif(\${ARCH} STREQUAL "arm64")
+  set(CMAKE_C_FLAGS "\${CMAKE_C_FLAGS} -arch arm64")
+  set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -arch arm64")
+  set(CMAKE_SYSTEM_PROCESSOR arm64)
+  set(APPLE True)
+endif()
+EOF
+
+sed -i -e "/^cmake_minimum_required/r $GTEST_PATH/CMakeLists_temp.txt"  $GTEST_PATH/CMakeLists.txt
+rm $GTEST_PATH/CMakeLists_temp.txt
+
 pushd $GTEST_PATH
 set -evx
 env | sort

build-tests.cmd

@@ -8,6 +8,11 @@ if DEFINED GIT_PULL_TOKEN (
   git clone https://%GIT_PULL_TOKEN%:x-oauth-basic@github.com/microsoft/cpp_client_telemetry_modules.git lib\modules
 )
 
+set GTEST_PATH=third_party\googletest
+if NOT EXIST %GTEST_PATH%\CMakeLists.txt (
+  git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH%
+)
+
 set PLATFORM=
 
 REM Possible platforms: Win32|x64