Use _SC_NPROCESSORS_CONF instead of _SC_NPROCESSORS_ONLN in Unix_Proc…

…essorCountTest on ARM/ARM64 (dotnet/corefx#30128) * See dotnet/coreclr#18289 Commit migrated from dotnet/corefx@ab52915
picenka21 · Jun 5, 2018 · caca77a · caca77a
1 parent c13a375
commit caca77a
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs b/src/libraries/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs
@@ -32,11 +32,25 @@ public void Windows_ProcessorCountTest()
         public void Unix_ProcessorCountTest()
         {
             //arrange
-            int _SC_NPROCESSORS_ONLN =
-                RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? 84 :
-                RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD")) ? 1002 :
-                58;
-            int expected = (int)sysconf(_SC_NPROCESSORS_ONLN);
+            int SYSCONF_GET_NUMPROCS;
+
+            if (RuntimeInformation.ProcessArchitecture == Architecture.Arm ||
+                RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+            {
+                SYSCONF_GET_NUMPROCS = /* _SC_NPROCESSORS_CONF */
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? 83 :
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD")) ? 1001 :
+                    57;
+            }
+            else
+            {
+                SYSCONF_GET_NUMPROCS = /* _SC_NPROCESSORS_ONLN */
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? 84 :
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD")) ? 1002 :
+                    58;
+            }
+
+            int expected = (int)sysconf(SYSCONF_GET_NUMPROCS);
 
             //act
             int actual = Environment.ProcessorCount;