From 7bf4dd0505572ebdcffbdebf2e21499634f1e1ad Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Thu, 4 Jun 2020 16:32:29 +0800 Subject: submit_for_testing-v2.sh: set TEST_METADATA_TOOLCHAIN with info from misc_info.txt when it is not specified in our build config. As when we build kernels with the build configs in the kernel tree, we won't know the toolchain information until we build the kernel, so we record the toolchain information in the file of misc_info.txt when we build the kernel, and use that to show the toolchain version used when build the kernel Change-Id: Ifc12371fca2f79488224323742cc4f2eac1476c3 Signed-off-by: Yongqin Liu --- lkft/lava-job-definitions/common/submit_for_testing-v2.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh index db2fcdd407..686c7eb57c 100755 --- a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh +++ b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh @@ -65,6 +65,14 @@ function submit_jobs_for_config(){ wget ${config_url} -O ${build_config} source ${build_config} + if [ -z "${TEST_METADATA_TOOLCHAIN}" ]; then + source out/${build_config}/misc_info.txt + if [ -n "${GKI_KERNEL_CLANG_VER}" ]; then + TEST_METADATA_TOOLCHAIN=${GKI_KERNEL_CLANG_VER} + elif [ -n "${VENDOR_KERNEL_CLANG_VER}" ]; then + TEST_METADATA_TOOLCHAIN=${VENDOR_KERNEL_CLANG_VER} + fi + fi check_environments export ANDROID_VERSION KERNEL_BRANCH KERNEL_REPO TEST_METADATA_TOOLCHAIN TEST_VTS_URL TEST_CTS_URL REFERENCE_BUILD_URL export TEST_VTS_VERSION=$(echo ${TEST_VTS_URL} | awk -F"/" '{print$(NF-1)}') -- cgit v1.2.3