From e3a06de55cf7d2f609977bf13d2ff99ea6934b70 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 11 Jul 2023 13:38:20 +0200 Subject: [PATCH 1/2] Add support for devices in processinfo3 test --- src/tests/tracing/eventpipe/processinfo3/processinfo3.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs index d288eaded11e4..1b35dff6e7cc1 100644 --- a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs +++ b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs @@ -312,6 +312,10 @@ public static int Main() } Logger.logger.Log("Finished checking process modules."); } + else if (OperatingSystem.IsAndroid() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) + { + expectedPortableRidOs = "unix"; + } Utils.Assert(!string.IsNullOrEmpty(expectedPortableRidOs), $"Unable to calculate expected portable RID OS."); From 33078cc3d10568659013a9d2735601053950dc84 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 11 Jul 2023 17:22:54 +0200 Subject: [PATCH 2/2] Add support for android portable RID OS --- src/tests/tracing/eventpipe/processinfo3/processinfo3.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs index 1b35dff6e7cc1..5d648e2d9d1a1 100644 --- a/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs +++ b/src/tests/tracing/eventpipe/processinfo3/processinfo3.cs @@ -312,10 +312,14 @@ public static int Main() } Logger.logger.Log("Finished checking process modules."); } - else if (OperatingSystem.IsAndroid() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) + else if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS()) { expectedPortableRidOs = "unix"; } + else if (OperatingSystem.IsAndroid()) + { + expectedPortableRidOs = "linux-bionic"; + } Utils.Assert(!string.IsNullOrEmpty(expectedPortableRidOs), $"Unable to calculate expected portable RID OS.");