From c4349654386c47d53a87625f728d641afb41ae20 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 17 Jul 2023 16:05:35 +0200 Subject: [PATCH] Add support for tvOS in os detection (#88988) --- src/native/eventpipe/ep-event-source.c | 4 ++-- src/tests/tracing/eventpipe/processinfo/processinfo.cs | 6 +++++- src/tests/tracing/eventpipe/processinfo2/processinfo2.cs | 6 +++++- src/tests/tracing/eventpipe/processinfo3/processinfo3.cs | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/native/eventpipe/ep-event-source.c b/src/native/eventpipe/ep-event-source.c index 2b1dccc..a605471 100644 --- a/src/native/eventpipe/ep-event-source.c +++ b/src/native/eventpipe/ep-event-source.c @@ -14,12 +14,12 @@ #if defined(HOST_WINDOWS) || defined(HOST_WIN32) const ep_char8_t* _ep_os_info = "Windows"; +#elif defined(HOST_TVOS) +const ep_char8_t* _ep_os_info = "tvOS"; #elif defined(HOST_IOS) const ep_char8_t* _ep_os_info = "iOS"; #elif defined(HOST_WATCHOS) const ep_char8_t* _ep_os_info = "WatchOS"; -#elif defined(HOST_TVOS) -const ep_char8_t* _ep_os_info = "tvOS"; #elif defined(__APPLE__) const ep_char8_t* _ep_os_info = "macOS"; #elif defined(HOST_ANDROID) diff --git a/src/tests/tracing/eventpipe/processinfo/processinfo.cs b/src/tests/tracing/eventpipe/processinfo/processinfo.cs index 4f0d613..b7b2b48 100644 --- a/src/tests/tracing/eventpipe/processinfo/processinfo.cs +++ b/src/tests/tracing/eventpipe/processinfo/processinfo.cs @@ -187,10 +187,14 @@ namespace Tracing.Tests.ProcessInfoValidation { expectedOSValue = "Android"; } - else if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) + else if (OperatingSystem.IsIOS()) { expectedOSValue = "iOS"; } + else if (OperatingSystem.IsTvOS()) + { + expectedOSValue = "tvOS"; + } else { expectedOSValue = "Unknown"; diff --git a/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs b/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs index 589af8d..1564c14 100644 --- a/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs +++ b/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs @@ -188,10 +188,14 @@ namespace Tracing.Tests.ProcessInfoValidation { expectedOSValue = "Android"; } - else if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) + else if (OperatingSystem.IsIOS()) { expectedOSValue = "iOS"; } + else if (OperatingSystem.IsTvOS()) + { + expectedOSValue = "tvOS"; + } else { expectedOSValue = "Unknown"; diff --git a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs index 5d648e2..a17659f 100644 --- a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs +++ b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs @@ -194,10 +194,14 @@ namespace Tracing.Tests.ProcessInfoValidation { expectedOSValue = "Android"; } - else if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) + else if (OperatingSystem.IsIOS()) { expectedOSValue = "iOS"; } + else if (OperatingSystem.IsTvOS()) + { + expectedOSValue = "tvOS"; + } else { expectedOSValue = "Unknown"; -- 2.7.4