From 2e28c8114d58870ebc1ae8aac51b4539d2314452 Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Mon, 3 Jun 2019 19:29:39 +0300 Subject: 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 --- build-test.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build-test.sh') diff --git a/build-test.sh b/build-test.sh index e2e54c7005..811ee28a1f 100755 --- 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 -- cgit v1.2.3