diff options
Diffstat (limited to 'tests/scripts')
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 8 | ||||
| -rwxr-xr-x | tests/scripts/arm32_ci_test.sh | 16 |
2 files changed, 7 insertions, 17 deletions
diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 209ab39869..98f35066d4 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -265,7 +265,9 @@ function cross_build_coreclr_with_docker { # For armel Tizen, we are going to construct RootFS on the fly. case $__linuxCodeName in tizen) - __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v4" + __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs" + __skipRootFS=1 + __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build" __runtimeOS="tizen.4.0.0" ;; *) @@ -381,7 +383,9 @@ function run_tests_using_docker { elif [ "$__buildArch" == "armel" ]; then case $__linuxCodeName in tizen) - __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v3" + __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs" + __skipRootFS=1 + __dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.test" ;; *) exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false diff --git a/tests/scripts/arm32_ci_test.sh b/tests/scripts/arm32_ci_test.sh index 2f0b03150b..3fb36e12ec 100755 --- a/tests/scripts/arm32_ci_test.sh +++ b/tests/scripts/arm32_ci_test.sh @@ -81,25 +81,11 @@ else fi if [ "$__abi" == "armel" ]; then - # TODO: Make use of a single Tizen rootfs for build and test - - # TODO-cleanup: the latest docker image already has mic installed. - # Prepare Tizen (armel) environment - #echo "deb http://download.tizen.org/tools/latest-release/Ubuntu_14.04 /" >> /etc/apt/sources.list - #apt-get update - #apt-get -y -qq --force-yes install mic - + # Prepare armel emulation environment pushd ${CORECLR_DIR}/cross/armel/tizen - mic --non-interactive create fs --pack-to=tizen.tar.gz tizen-dotnet.ks - if [ -d ${__ROOTFS_DIR} ]; then - mv ${__ROOTFS_DIR} ${__ROOTFS_DIR}_build - fi - mkdir -p ${__ROOTFS_DIR} - tar -zxf mic-output/tizen.tar.gz -C ${__ROOTFS_DIR} apt-get update apt-get -y -qq --force-yes --reinstall install qemu binfmt-support qemu-user-static __qemuARM=$(which qemu-arm-static) - cp $__qemuARM ${CORECLR_DIR}/cross/rootfs/armel/usr/bin/ cp $__qemuARM ${__ROOTFS_DIR}/usr/bin/ popd fi |