Merge branch 'master' into mkoscumb-fix-ub-in-tpmstub

lib/pal/posix/sysinfo_utils_apple.mm

@@ -42,12 +42,6 @@ NSString* get_system_value(NSString* key)
     return @"";
 }
 
-std::string GetDeviceOsName()
-{
-    NSString* value = get_system_value(@"ProductName");
-    return std::string([value UTF8String]);
-}
-
 std::string GetDeviceOsVersion()
 {
     NSString* value = get_system_value(@"ProductVersion");

lib/pal/posix/sysinfo_utils_ios.mm

@@ -17,6 +17,11 @@ std::string GetDeviceModel()
     }
 }
 
+std::string GetDeviceOsName()
+{
+    return std::string("iOS");
+}
+
 std::string GetDeviceId()
 {
     @autoreleasepool {

lib/pal/posix/sysinfo_utils_mac.cpp

@@ -26,6 +26,11 @@ std::string GetDeviceModel()
     return deviceModel;
 }
 
+std::string GetDeviceOsName()
+{
+    return std::string("Mac OS X");
+}
+
 std::string GetDeviceId()
 {
     uuid_t uuidBytes;

tests/unittests/CMakeLists.txt

@@ -42,6 +42,14 @@ set(SRCS
   UtilsTests.cpp
 )
 
+if (APPLE)
+  if (BUILD_IOS)
+    list(APPEND SRCS SysInfoUtilsTests_iOS.cpp)
+  else()
+    list(APPEND SRCS SysInfoUtilsTests_Mac.cpp)
+  endif()
+endif()
+
 source_group(" "      REGULAR_EXPRESSION "")
 source_group("common" REGULAR_EXPRESSION "/tests/common/")
 

tests/unittests/SysInfoUtilsTests_Mac.cpp

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+#include "common/Common.hpp"
+#include "pal/posix/sysinfo_utils_apple.hpp"
+
+using namespace testing;
+using namespace MAT;
+
+TEST(SysInfoUtilsTests, GetDeviceOsName_Mac_ReturnsMacOsX)
+{
+    ASSERT_EQ(std::string { "Mac OS X" }, GetDeviceOsName());
+}

tests/unittests/SysInfoUtilsTests_iOS.cpp

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+#include "common/Common.hpp"
+#include "pal/posix/sysinfo_utils_apple.hpp"
+
+using namespace testing;
+using namespace MAT;
+
+TEST(SysInfoUtilsTests, GetDeviceOsName_iOS_ReturnsiOS)
+{
+    ASSERT_EQ(std::string { "iOS" }, GetDeviceOsName());
+}