Fix armel tests build (#24678)

* Fix build-tests script for cross build and fix tests for armel

* Handle case of -skipcrossgen for cross builds

* Fix build error in case of cross builds when ROOTFS_DIR is not passed explicitly

* Fix portable build parameter setup for armel tests build

* Move force of non-portable build for armel from build.sh/build-test.sh to init-distro-rid.sh

* Fix priority1 tests build for armel

diff --git a/build-test.sh b/build-test.sh
index e2e54c7..811ee28 100755 (executable)
--- a/build-test.sh
+++ b/build-test.sh
@@ -994,6 +994,10 @@ fi
 # init the target distro name
 initTargetDistroRid
 
+if [ $__PortableBuild == 0 ]; then
+    __CommonMSBuildArgs="$__CommonMSBuildArgs /p:PortableBuild=false"
+fi
+
 # Restore Build Tools
 source $__ProjectRoot/init-tools.sh
 

diff --git a/build.sh b/build.sh
index f9f8bff..78ee31d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -441,13 +441,19 @@ build_CoreLib()
         exit 1
     fi
 
+    local __CoreLibILDir=$__BinDir/IL
+
     if [ $__SkipCrossgen == 1 ]; then
         echo "Skipping generating native image"
+
+        if [ $__CrossBuild == 1 ]; then
+            # Crossgen not performed, so treat the IL version as the final version
+            cp $__CoreLibILDir/System.Private.CoreLib.dll $__BinDir/System.Private.CoreLib.dll
+        fi
+
         return
     fi
 
-    local __CoreLibILDir=$__BinDir/IL
-
     # The cross build generates a crossgen with the target architecture.
     if [ $__CrossBuild == 0 ]; then
        if [ $__SkipCoreCLR == 1 ]; then
@@ -986,15 +992,6 @@ if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then
     fi
 fi
 
-if [[ "$__BuildArch" == "armel" ]]; then
-    # Armel cross build is Tizen specific and does not support Portable RID build
-    __PortableBuild=0
-fi
-
-if [ $__PortableBuild == 0 ]; then
-    __CommonMSBuildArgs="$__CommonMSBuildArgs /p:PortableBuild=false"
-fi
-
 # Set dependent variables
 __LogsDir="$__RootBinDir/Logs"
 __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
@@ -1012,9 +1009,21 @@ if [ $__CrossBuild == 1 ]; then
 fi
 __CrossGenCoreLibLog="$__LogsDir/CrossgenCoreLib_$__BuildOS.$__BuildArch.$__BuildType.log"
 
+# Configure environment if we are doing a cross compile.
+if [ $__CrossBuild == 1 ]; then
+    export CROSSCOMPILE=1
+    if ! [[ -n "$ROOTFS_DIR" ]]; then
+        export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch"
+    fi
+fi
+
 # init the target distro name
 initTargetDistroRid
 
+if [ $__PortableBuild == 0 ]; then
+    __CommonMSBuildArgs="$__CommonMSBuildArgs /p:PortableBuild=false"
+fi
+
 # Init if MSBuild for .NET Core is supported for this platform
 isMSBuildOnNETCoreSupported
 
@@ -1032,14 +1041,6 @@ fi
 # This is where all built CoreClr libraries will copied to.
 export __CMakeBinDir="$__BinDir"
 
-# Configure environment if we are doing a cross compile.
-if [ $__CrossBuild == 1 ]; then
-    export CROSSCOMPILE=1
-    if ! [[ -n "$ROOTFS_DIR" ]]; then
-        export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch"
-    fi
-fi
-
 # Make the directories necessary for build if they don't exist
 setup_dirs
 

diff --git a/init-distro-rid.sh b/init-distro-rid.sh
index ebf77fc..dc9bb04 100755 (executable)
--- a/init-distro-rid.sh
+++ b/init-distro-rid.sh
@@ -133,6 +133,12 @@ initDistroRidGlobal()
         fi
     fi
 
+    if [ "$buildArch" = "armel" ]; then
+        # Armel cross build is Tizen specific and does not support Portable RID build
+        export __PortableBuild=0
+        isPortable=0
+    fi
+
     initNonPortableDistroRid ${buildOs} ${buildArch} ${isPortable} ${rootfsDir}
 
     if [ -z "${__DistroRid}" ]; then

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
index b5e06a6..5a68cc6 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
@@ -30,10 +30,11 @@
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
     <Compile Condition="'$(BuildArch)' == 'arm'" Include="arglistARM.il" />
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="arglist64.il" />
+    <Compile Condition="'$(BuildArch)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
index b5e06a6..5a68cc6 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
@@ -30,10 +30,11 @@
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
     <Compile Condition="'$(BuildArch)' == 'arm'" Include="arglistARM.il" />
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="arglist64.il" />
+    <Compile Condition="'$(BuildArch)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
index b5e06a6..5a68cc6 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
@@ -30,10 +30,11 @@
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
     <Compile Condition="'$(BuildArch)' == 'arm'" Include="arglistARM.il" />
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="arglist64.il" />
+    <Compile Condition="'$(BuildArch)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
index b5e06a6..5a68cc6 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
@@ -30,10 +30,11 @@
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
     <Compile Condition="'$(BuildArch)' == 'arm'" Include="arglistARM.il" />
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="arglist64.il" />
+    <Compile Condition="'$(BuildArch)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
index 0248ae2..6c2313a 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
@@ -30,6 +30,7 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="i_array_merge-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="i_array_merge-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
index eb3376a..aa10f16 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
@@ -28,10 +28,11 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="sizeof-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="sizeof-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="sizeof-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
index 40deb2b..53dbacb 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
@@ -30,6 +30,7 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="u_array_merge-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="u_array_merge-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
index ba9ac58..4e1fe4b 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
@@ -30,6 +30,7 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="i_array_merge-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="i_array_merge-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
index e5a8e13..366e719 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
@@ -28,10 +28,11 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="sizeof-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="sizeof-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="sizeof-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
index f009a69..3e97a87 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
@@ -30,6 +30,7 @@
     <Compile Condition="'$(BuildArch)' == 'arm64'" Include="u_array_merge-ia64.il" />
     <Compile Condition="'$(BuildArch)' ==   'x86'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(BuildArch)' ==   'arm'" Include="u_array_merge-i386.il" />
+    <Compile Condition="'$(BuildArch)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/tests/src/dir.props b/tests/src/dir.props
index ce2d982..c61035f 100644 (file)
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -34,6 +34,7 @@
     <PointerSize Condition="'$(Platform)'=='arm64'">64</PointerSize>
     <PointerSize Condition="'$(Platform)'=='x86'">32</PointerSize>
     <PointerSize Condition="'$(Platform)'=='arm'">32</PointerSize>
+    <PointerSize Condition="'$(Platform)'=='armel'">32</PointerSize>
   </PropertyGroup>
 
   <!-- Setup the default output and intermediate paths -->