Fix CoreCLR test build for SunOS (dotnet#37824)

shadow-cs · Jun 24, 2020 · d65dd30 · d65dd30
1 parent d908270
commit d65dd30
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
@@ -199,6 +199,6 @@
 
   <PropertyGroup>
     <LiveRuntimeIdentifierGraphPath>$(RuntimeIdGraphDefinitionFile)</LiveRuntimeIdentifierGraphPath>
-    <RuntimeIdentifierGraphPath Condition="'$(UseLiveRuntimeIdentifierGraph)' == 'true'">$(LiveRuntimeIdentifierGraphPath)</RuntimeIdentifierGraphPath>
+    <BundledRuntimeIdentifierGraphFile>$(LiveRuntimeIdentifierGraphPath)</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
 </Project>
diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py
@@ -74,7 +74,7 @@ def __init__(self,
 
         self.valid_arches = ["x64", "x86", "arm", "arm64"]
         self.valid_build_types = ["Debug", "Checked", "Release"]
-        self.valid_host_os = ["Windows_NT", "OSX", "Linux"]
+        self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris"]
 
         self.__initialize__(args)
 
@@ -183,8 +183,11 @@ def provide_default_host_os():
             return "OSX"
         elif sys.platform == "win32":
             return "Windows_NT"
+        elif sys.platform.startswith("sunos"):
+            is_illumos = ('illumos' in subprocess.Popen(["uname", "-o"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode('utf-8'))
+            return 'illumos' if is_illumos else 'Solaris'
         else:
-            print("Unknown OS: %s" % self.host_os)
+            print("Unknown OS: %s" % sys.platform)
             sys.exit(1)
 
     @staticmethod

diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj
@@ -97,6 +97,7 @@
     </ItemGroup>
   </Target>
 
+  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <Target Name="CoreCompile">

diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh
@@ -73,11 +73,15 @@ function check_cpu_architecture {
     local CPUName=$(uname -m)
     local __arch=
 
+    if [[ "$(uname -s)" == "SunOS" ]]; then
+        CPUName=$(isainfo -n)
+    fi
+
     case $CPUName in
         i686)
             __arch=x86
             ;;
-        x86_64)
+        amd64|x86_64)
             __arch=x64
             ;;
         armv7l)

diff --git a/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj b/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj
@@ -8,4 +8,5 @@
     <ProjectAssetsFile>$(TestSourceDir)Common\ilasm\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
 </Project>
diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
@@ -137,8 +137,8 @@
         <!-- Filter .dylib files on OSX -->
         <NativeProjectBinariesDyLibFilter Condition="'$(TargetOS)' == 'OSX' and $([System.Text.RegularExpressions.Regex]::IsMatch(['%(Identity)', `(.*\/).*\.dylib`))" Include="@(NativeProjectBinariesMatched)" />
 
-        <!-- Filter .so files on Linux -->
-        <NativeProjectBinariesDyLibFilter Condition="'$(TargetOS)' == 'Linux' and $([System.Text.RegularExpressions.Regex]::IsMatch(['%(Identity)', `(.*\/).*\.so`))" Include="@(NativeProjectBinariesMatched)" />
+        <!-- Filter .so files on non-OSX Unix -->
+        <NativeProjectBinariesDyLibFilter Condition="'$(RunningOnUnix)' == 'true' and '$(TargetOS)' != 'OSX' and $([System.Text.RegularExpressions.Regex]::IsMatch(['%(Identity)', `(.*\/).*\.so`))" Include="@(NativeProjectBinariesMatched)" />
 
         <!-- Filter static lib files on Unix -->
         <NativeProjectBinariesStaticLibFilter Condition="'$(RunningOnUnix)' == 'true' and $([System.Text.RegularExpressions.Regex]::IsMatch(['%(Identity)', `(.*\/).*\.a`))" Include="@(NativeProjectBinariesMatched)" />

diff --git a/src/coreclr/tests/src/profiler/native/profilerstring.h b/src/coreclr/tests/src/profiler/native/profilerstring.h
@@ -9,7 +9,11 @@
 #include <cstring>
 #include <string>
 
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef _WIN32
+#define WCHAR(str) L##str
+#define CAST_CHAR(ch) ch
+
+#else // defined(_WIN32)
 
 // Definitely won't work for non-ascii characters so hopefully we never start using
 // them in the tests
@@ -56,10 +60,7 @@ inline int wcscmp(const char16_t *lhs, const char16_t *rhs)
     return lhs[i] - rhs[i];
 }
 
-#else // defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
-#define WCHAR(str) L##str
-#define CAST_CHAR(ch) ch
-#endif // defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+#endif // defined(__WIN32)
 
 // 16 bit string type that works cross plat and doesn't require changing widths
 // on non-windows platforms

diff --git a/src/coreclr/tryrun.cmake b/src/coreclr/tryrun.cmake
@@ -67,7 +67,7 @@ if(TARGET_ARCH_NAME MATCHES "^(armel|arm|arm64|x86)$" OR FREEBSD OR ILLUMOS)
     set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1)
     set_cache_value(HAVE_PROCFS_MAPS 0)
     set_cache_value(HAVE_PROCFS_STAT 0)
-    set_cache_value(HAVE_PROCFS_STATUS_EXITCODE 0)
+    set_cache_value(HAVE_PROCFS_STATUS_EXITCODE 1)
     set_cache_value(GETPWUID_R_SETS_ERRNO 0)
     set_cache_value(UNGETC_NOT_RETURN_EOF 0)
     set_cache_value(HAVE_COMPATIBLE_ILOGBNAN 1)
@@ -82,9 +82,7 @@ if(TARGET_ARCH_NAME MATCHES "^(armel|arm|arm64|x86)$" OR FREEBSD OR ILLUMOS)
     set_cache_value(HAVE_COMPATIBLE_LOG10_EXITCODE 1)
     set_cache_value(HAVE_COMPATIBLE_LOG_EXITCODE 1)
     set_cache_value(HAVE_LARGE_SNPRINTF_SUPPORT_EXITCODE 1)
-    set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1)
-    set_cache_value(HAVE_PROCFS_STATUS_EXITCODE 1)
-    set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 1)
+    set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0)
     set_cache_value(SSCANF_CANNOT_HANDLE_MISSING_EXPONENT_EXITCODE 1)
     set_cache_value(SSCANF_SUPPORT_ll_EXITCODE 1)
     set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0)