Fix armel tests build #24678
Fix armel tests build #24678
Conversation
build-test.sh
Outdated
| @@ -317,7 +317,10 @@ build_Tests() | |||
| fi | |||
|
|
|||
| if [ $__SkipNative != 1 ]; then | |||
| export CROSSCOMPILEREAL=${CROSSCOMPILE} | |||
There was a problem hiding this comment.
CROSSCOMPILEREAL is used to just temporarily save value of CROSSCOMPILE. Logic here is now the same as in build.sh, where CROSSCOMPILE is set to 0 before build_native
There was a problem hiding this comment.
I am confused why we would unset crosscompile here for the native build. It seems like that is where it is actually needed.
There was a problem hiding this comment.
You were right, this was an incorrect change. Correct fix was to properly setup portable build parameter. I've updated PR.
build-test.sh
Outdated
| @@ -948,6 +948,15 @@ if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then | |||
| fi | |||
| fi | |||
|
|
|||
| if [[ "$__BuildArch" == "armel" ]]; then | |||
There was a problem hiding this comment.
Can you hoist this decision out of build-test and put it in init-distro-rid.sh
There was a problem hiding this comment.
I've updated build.sh and build-test.sh. Also, I've fixed armel build for priority1 tests.
…h to init-distro-rid.sh
|
@jashook could you, please, take a look |
* 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 Commit migrated from dotnet/coreclr@2e28c81
After this PR System.Private.CoreLib.dll is copied to bin dir if
-skipcrossgenis passed to build.sh, and build-test.sh successfully finishes forarmelcross build.Also, cross build is fixed if
ROOTFS_DIRis not passed explicitly.cc @alpencolt @alexander-aksenov